Hello community, here is the log from the commit of package servletapi3 for openSUSE:Factory checked in at 2014-08-01 19:27:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi3 (Old) and /work/SRC/openSUSE:Factory/.servletapi3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "servletapi3" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi3/servletapi3.changes 2013-09-12 13:33:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi3.new/servletapi3.changes 2014-08-01 19:27:09.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 29 11:21:30 UTC 2014 - tchvatal@suse.com + +- No not mess with the defattr as it is not really needed. + +------------------------------------------------------------------- +Mon Jul 21 10:28:11 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner. +- Fix update-alternatives. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi3.spec ++++++ --- /var/tmp/diff_new_pack.UeQBsR/_old 2014-08-01 19:27:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UeQBsR/_new 2014-08-01 19:27:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package servletapi3 # -# 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 @@ -14,47 +14,38 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 -Name: servletapi3 -BuildRequires: ant -BuildRequires: java2-devel-packages -BuildRequires: xml-commons-apis %define base_name servletapi -%define major_version 3 -%define name %{base_name}%{major_version} %define full_name jakarta-%{base_name} -%define version 3.3.1 -%define release 0.a.2jpp -%define section free +Name: servletapi3 Version: 3.3.1 Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-2.0 Group: Development/Libraries/Java Url: http://jakarta.apache.org/tomcat/ -Source0: http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3.1a/src/jakarta-... -Patch: %{name}-java14compat.patch -Provides: servlet -PreReq: /usr/sbin/update-alternatives +Source0: http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}a/src/%{full_name}-src.tar.gz +Patch0: %{name}-java14compat.patch +BuildRequires: ant BuildRequires: ant >= 1.6.2 +BuildRequires: java2-devel-packages BuildRequires: javapackages-tools -BuildArch: noarch +BuildRequires: xml-commons-apis +Requires(post): %{_sbindir}/update-alternatives +Provides: servlet = %{version} +Obsoletes: servlet22 < %{version} +Obsoletes: servlet3 < %{version} +Provides: servlet22 = %{version} +Provides: servlet3 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: servlet22 -Obsoletes: servlet3 -Provides: servlet22 -Provides: servlet3 +BuildArch: noarch %description This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). - - %package javadoc -PreReq: coreutils Summary: Javadoc for servletapi3 Group: Development/Libraries/Java @@ -62,26 +53,24 @@ This package contains the javadoc documentation for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). - - %prep %setup -q -n %{full_name}-src -%patch +%patch0 %build ant dist -Dservletapi.build=build -Dservletapi.dist=dist %install # jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/lib/servlet.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 dist/lib/servlet.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) #javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} +# 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 30 @@ -92,12 +81,14 @@ fi %files -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc LICENSE README %{_javadir}/* +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org