From bc273e3fbae93ab3e82e38b836d0fa824988580e893491cf4634249217c6b6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 19 Jul 2014 09:35:46 +0000 Subject: [PATCH] - Fix once more the alternatives. OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=51 --- tomcat.changes | 5 +++++ tomcat.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 09975da..42812da 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 19 09:35:11 UTC 2014 - tchvatal@suse.com + +- Fix once more the alternatives. + ------------------------------------------------------------------- Fri Jul 11 14:16:47 UTC 2014 - tchvatal@suse.com diff --git a/tomcat.spec b/tomcat.spec index a0f98ee..e569785 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -540,16 +540,17 @@ ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh # Install update-alternatives content mkdir -p %{buildroot}%{_sysconfdir}/alternatives -ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_javadir}/el_api.jar ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/el_api.jar -ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_javadir}/el_1_0_api.jar +ln -s %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar + ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar +ln -s %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar -ln -s %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{buildroot}%{_javadir}/jsp.jar ln -s %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/jsp.jar +ln -s %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar -ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{buildroot}%{_javadir}/servlet.jar ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/servlet.jar +ln -s %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar %pre # add the tomcat user and group @@ -696,8 +697,8 @@ rm -f \ %{libdir}/%{name}-el-%{elspec}-api.jar %{_mavenpomdir}/JPP-%{name}-el-api.pom %{_mavendepmapfragdir}/%{name}-tomcat-el-api -%ghost %{_javadir}/el_1_0_api.jar -%ghost %{_javadir}/el_api.jar +%{_javadir}/el_1_0_api.jar +%{_javadir}/el_api.jar %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar %ghost %{_sysconfdir}/alternatives/el_api.jar @@ -709,7 +710,7 @@ rm -f \ %defattr(0644,root,root,0755) %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{_javadir}/%{name}-jsp-api.jar -%ghost %{_javadir}/jsp.jar +%{_javadir}/jsp.jar %ghost %{_sysconfdir}/alternatives/jsp.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api