From 39481d42d16448e6616216e53f7672c3b2a73f3c Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Nov 18 2009 14:19:49 +0000 Subject: - Add unversioned symlinks in javadir. --- diff --git a/jetty.spec b/jetty.spec index 175d0f4..b717af7 100644 --- a/jetty.spec +++ b/jetty.spec @@ -42,7 +42,7 @@ Name: jetty Version: 6.1.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -233,7 +233,9 @@ install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name} install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} echo '# Placeholder configuration file. No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar +ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util-%{version}.jar +ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util.jar ( cat << EO_RC JAVA_HOME=/usr/lib/jvm/java JAVA_OPTIONS= @@ -341,7 +343,9 @@ fi %defattr(-,root,root,-) %{_bindir}/* %dir %{_javadir}/%{name} +%{_javadir}/%{name}/%{name}.jar %{_javadir}/%{name}/%{name}-%{version}.jar +%{_javadir}/%{name}/%{name}-util.jar %{_javadir}/%{name}/%{name}-util-%{version}.jar %config(noreplace) %{confdir} %dir %{jettylibdir} @@ -367,6 +371,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Nov 18 2009 Alexander Kurtakov 6.1.20-6 +- Add unversioned symlinks in javadir. + * Tue Nov 03 2009 Jeff Johnston 6.1.20-5 - Security patch - Resolves #532675, #532656