Hello community, here is the log from the commit of package servletapi3 for openSUSE:Factory checked in at 2017-09-20 17:10:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi3 (Old) and /work/SRC/openSUSE:Factory/.servletapi3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servletapi3" Wed Sep 20 17:10:04 2017 rev:18 rq:527171 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi3/servletapi3.changes 2015-10-06 13:26:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi3.new/servletapi3.changes 2017-09-20 17:10:05.363528471 +0200 @@ -1,0 +2,9 @@ +Mon Sep 18 22:29:43 UTC 2017 - [email protected] + +- Fix jdk9 build: specify java source and target 1.6 +- Removed patch: + * servletapi3-java14compat.patch + + not needed, since the java source and target can be handled + by ant.build.javac.{source,target} properties + +------------------------------------------------------------------- Old: ---- servletapi3-java14compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi3.spec ++++++ --- /var/tmp/diff_new_pack.8e7o7u/_old 2017-09-20 17:10:06.227406863 +0200 +++ /var/tmp/diff_new_pack.8e7o7u/_new 2017-09-20 17:10:06.235405737 +0200 @@ -1,7 +1,7 @@ # # spec file for package servletapi3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,10 +26,9 @@ Group: Development/Libraries/Java Url: http://jakarta.apache.org/tomcat/ 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: java-devel >= 1.7.0 +BuildRequires: fdupes +BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: xml-commons-apis Requires(post): %{_sbindir}/update-alternatives @@ -38,7 +37,6 @@ Obsoletes: servlet3 < %{version} Provides: servlet22 = %{version} Provides: servlet3 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -55,10 +53,12 @@ %prep %setup -q -n %{full_name}-src -%patch0 %build -ant dist -Dservletapi.build=build -Dservletapi.dist=dist +ant \ + -Dant.build.javac.target=1.6 -Dant.build.javac.source=1.6 \ + -Dservletapi.build=build -Dservletapi.dist=dist \ + dist %install # jar @@ -68,6 +68,7 @@ #javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar @@ -81,14 +82,12 @@ fi %files -%defattr(-,root,root) %doc LICENSE README %{_javadir}/* %{_javadir}/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name} %changelog
