Hello community, here is the log from the commit of package paperclips for openSUSE:Factory checked in at 2017-09-20 17:13:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/paperclips (Old) and /work/SRC/openSUSE:Factory/.paperclips.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paperclips" Wed Sep 20 17:13:51 2017 rev:2 rq:527464 version:1.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/paperclips/paperclips.changes 2016-08-12 15:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.paperclips.new/paperclips.changes 2017-09-20 17:13:53.195456744 +0200 @@ -1,0 +2,9 @@ +Wed Sep 20 07:02:33 UTC 2017 - [email protected] + +- Specify java source and target level 1.6: fix build with jdk9 +- Added patch: + * paperclips-1.0.4-javadoc.patch + + Don't hardcode the source level, specify it on command-line + + Fix the classpath to look for swt.jar in the right place + +------------------------------------------------------------------- New: ---- paperclips-1.0.4-javadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paperclips.spec ++++++ --- /var/tmp/diff_new_pack.8f3tWS/_old 2017-09-20 17:13:53.811370043 +0200 +++ /var/tmp/diff_new_pack.8f3tWS/_new 2017-09-20 17:13:53.815369480 +0200 @@ -1,7 +1,7 @@ # # spec file for package paperclips # -# Copyright (c) 2016 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 @@ -24,12 +24,13 @@ Group: Development/Languages/Java Url: https://code.google.com/archive/p/swt-paperclips/ Source: http://swt-paperclips.googlecode.com/files/net.sf.paperclips.source_%{version}.200908120926.jar +Patch0: paperclips-1.0.4-javadoc.patch BuildRequires: ant BuildRequires: eclipse-swt +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: unzip -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -59,12 +60,13 @@ %prep %setup -q -c %{name}-%{version} +%patch0 -p1 %build export CLASSPATH=%{_libdir}/java/swt.jar pushd src - %javac -g -encoding UTF-8 $(find . -type f -name "*.java") + %javac -source 1.6 -target 1.6 -g -encoding UTF-8 $(find . -type f -name "*.java") jarfile="../net.sf.paperclips_%{version}.jar" files="$(find . -type f \( -name '*.class' -o -name '*.properties' \))" test ! -d classes && mf="" \ @@ -73,7 +75,9 @@ || %jar cvf $jarfile $files popd -%{ant} -f gen_javadoc.xml +%{ant} \ + -f gen_javadoc.xml \ + -Dant.build.javac.source=1.6 -Dswt.jar=$(build-classpath swt) %install mkdir -p %{buildroot}%{_javadir} @@ -81,13 +85,12 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} cp -r api/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} %files -%defattr(-,root,root) %{_javadir}/net.sf.paperclips_%{version}.jar %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name}-%{version} %changelog ++++++ paperclips-1.0.4-javadoc.patch ++++++ --- paperclips-1.0.4/gen_javadoc.xml 2017-09-20 07:58:21.542429755 +0200 +++ paperclips-1.0.4/gen_javadoc.xml 2017-09-20 08:09:27.966056004 +0200 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <project default="javadoc"> <target name="javadoc"> - <javadoc access="protected" author="true" classpath="class;C:\Program Files\Eclipse\RCP\3.2\plugins\org.eclipse.swt_3.2.0.v3232o.jar;C:\Program Files\Eclipse\RCP\3.2\plugins\org.eclipse.swt.win32.win32.x86_3.2.0.v3232m.jar" destdir="api" doctitle="PaperClips 1.0.3 API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="net.sf.paperclips,net.sf.paperclips.decorator,net.sf.paperclips.ui" source="1.4" sourcepath="../net.sf.paperclips.ui/src;src" splitindex="true" use="true" version="true"/> + <property name="swt.jar" value="swt.jar"/> + <javadoc access="protected" author="true" classpath="class;${swt.jar}" destdir="api" doctitle="PaperClips 1.0.3 API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="net.sf.paperclips,net.sf.paperclips.decorator,net.sf.paperclips.ui" sourcepath="../net.sf.paperclips.ui/src;src" splitindex="true" use="true" version="true"/> </target> </project>
