Hello community, here is the log from the commit of package servletapi5 for openSUSE:Factory checked in at 2014-08-01 19:26:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old) and /work/SRC/openSUSE:Factory/.servletapi5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servletapi5" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2013-08-25 13:32:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes 2014-08-01 19:26:57.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 21 10:38:49 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. +- Fix update-alternatives code + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi5.spec ++++++ --- /var/tmp/diff_new_pack.RMJYhH/_old 2014-08-01 19:26:57.000000000 +0200 +++ /var/tmp/diff_new_pack.RMJYhH/_new 2014-08-01 19:26:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package servletapi5 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,40 +16,34 @@ # -Name: servletapi5 -BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: xml-commons-apis-bootstrap -#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis -#!BuildIgnore: xml-commons-jaxp-1.3-apis %define base_name servletapi -%define major_version 5 -%define name %{base_name}%{major_version} %define full_name jakarta-%{base_name} -%define version 5.0.18 -%define release 1jpp -%define section free +Name: servletapi5 Version: 5.0.18 Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-2.0 Group: Development/Libraries/Java +Url: http://jakarta.apache.org/tomcat/ Source: %{full_name}-5-src.tar.gz Patch150: java150_build.patch -Url: http://jakarta.apache.org/tomcat/ -Requires: /usr/sbin/update-alternatives -BuildArch: noarch +#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: xml-commons-apis-bootstrap +Requires(post): update-alternatives +Provides: servlet = %{version} +Provides: servlet24 = %{version} +Provides: servlet5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: servlet -Provides: servlet24 -Provides: servlet5 +BuildArch: noarch %description This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). %prep -rm -rf $RPM_BUILD_ROOT %setup -q -c -T -a 0 -n %{full_name}-5-src %patch150 @@ -70,14 +64,27 @@ %install cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5 # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar -install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 jsr152/dist/lib/jsp-api.jar %{buildroot}%{_javadir}/jspapi-%{version}.jar +install -m 644 jsr154/dist/lib/servlet-api.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar + +%post +update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 50 + +%postun +if [ "$1" = "0" ]; then + update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar +fi %files %defattr(-,root,root) %doc LICENSE %{_javadir}/* +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
