Hello community, here is the log from the commit of package netcomponents for openSUSE:Factory checked in at 2017-09-20 17:12:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcomponents (Old) and /work/SRC/openSUSE:Factory/.netcomponents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcomponents" Wed Sep 20 17:12:55 2017 rev:17 rq:527348 version:1.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/netcomponents/netcomponents.changes 2017-05-22 10:49:04.659432608 +0200 +++ /work/SRC/openSUSE:Factory/.netcomponents.new/netcomponents.changes 2017-09-20 17:13:01.810690123 +0200 @@ -1,0 +2,9 @@ +Tue Sep 19 15:38:03 UTC 2017 - [email protected] + +- Specify java source and target level 1.6: fix jdk9 build +- Modified patch: + * netcomponents-java14compat.patch + + Don't hardcode java source and target levels, specify them + on command-line. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcomponents.spec ++++++ --- /var/tmp/diff_new_pack.H6rhLU/_old 2017-09-20 17:13:03.166499267 +0200 +++ /var/tmp/diff_new_pack.H6rhLU/_new 2017-09-20 17:13:03.170498704 +0200 @@ -26,8 +26,8 @@ Source: http://www.savarese.org/downloads/NetComponents/NetComponents-1.3.8-src.tar.gz Patch0: %{name}-java14compat.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: xml-commons-apis -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -69,7 +69,9 @@ %patch0 -p1 %build -ant jar javadocs +ant \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + jar javadocs %install # jar @@ -79,14 +81,13 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc CHANGES README COPYRIGHT LICENSE %{_javadir}/* %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog ++++++ netcomponents-java14compat.patch ++++++ --- /var/tmp/diff_new_pack.H6rhLU/_old 2017-09-20 17:13:03.202494200 +0200 +++ /var/tmp/diff_new_pack.H6rhLU/_new 2017-09-20 17:13:03.202494200 +0200 @@ -1,39 +1,3 @@ -Nur in NetComponents-1.3.8: build. -diff -ru NetComponents-1.3.8.orig/build.xml NetComponents-1.3.8/build.xml ---- NetComponents-1.3.8.orig/build.xml 2001-11-30 04:20:12.000000000 +0100 -+++ NetComponents-1.3.8/build.xml 2007-07-23 21:13:39.462024000 +0200 -@@ -33,7 +33,9 @@ - excludes="examples/**" - debug="${build.debug}" - deprecation="${build.deprecation}" -- optimize="${build.optimize}"/> -+ optimize="${build.optimize}" -+ source="1.4" -+ target="1.4" /> - </target> - - <!-- examples target. Compiles the example classes. --> -@@ -44,7 +46,9 @@ - destdir="${build.dir}/examples" - debug="${build.debug}" - deprecation="${build.deprecation}" -- optimize="${build.optimize}"/> -+ optimize="${build.optimize}" -+ source="1.4" -+ target="1.4"/> - </target> - - <!-- jar target. Compiles the source directory and creates a .jar file --> -@@ -68,7 +72,8 @@ - windowtitle="${name} ${version} API" - doctitle="${name} ${version} API" - header="<map name='_logoMap'><area href='http://www.savarese.org/' alt='Savarese.Org Home' shape=rect coords='0,0,66,14'><area href='http://www.savarese.org/oro/' alt='ORO Home'shape=rect coords='0,15,66,70'></map><img src='{@docroot}/../images/soroLogo.gif' alt='Savarese.Org/ORO Logo' width=67 height=71 align=left border=0 hspace=1 vspace=0 usemap='#_logoMap'>" -- bottom="${copyright.message}"> -+ bottom="${copyright.message}" -+ source="1.4"> - <!-- - overview="${build.src.dir}/com/oroinc/overview.html" - --> diff -ru NetComponents-1.3.8.orig/src/java/com/oroinc/net/ftp/FTP.java NetComponents-1.3.8/src/java/com/oroinc/net/ftp/FTP.java --- NetComponents-1.3.8.orig/src/java/com/oroinc/net/ftp/FTP.java 2001-11-30 04:20:12.000000000 +0100 +++ NetComponents-1.3.8/src/java/com/oroinc/net/ftp/FTP.java 2007-07-23 21:10:49.091561000 +0200
