Hello community, here is the log from the commit of package jgoodies-forms for openSUSE:Factory checked in at 2017-09-20 17:10:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jgoodies-forms (Old) and /work/SRC/openSUSE:Factory/.jgoodies-forms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgoodies-forms" Wed Sep 20 17:10:24 2017 rev:4 rq:527231 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jgoodies-forms/jgoodies-forms.changes 2014-07-29 16:48:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jgoodies-forms.new/jgoodies-forms.changes 2017-09-20 17:10:26.236590178 +0200 @@ -1,0 +2,6 @@ +Tue Sep 19 07:38:27 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 +- Clean spec file and fix duplicate waste rpmlint error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jgoodies-forms.spec ++++++ --- /var/tmp/diff_new_pack.cfq5Hj/_old 2017-09-20 17:10:26.936491654 +0200 +++ /var/tmp/diff_new_pack.cfq5Hj/_new 2017-09-20 17:10:26.940491091 +0200 @@ -1,7 +1,7 @@ # # spec file for package jgoodies-forms # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -27,13 +27,13 @@ Url: http://jgoodies.com Source0: http://www.jgoodies.com/download/libraries/%{_shortname}/%{_shortname}-%{tar_ver}.zip BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: unzip BuildRequires: xml-commons-apis BuildRequires: xml-commons-resolver Requires: jre >= 1.5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -53,8 +53,10 @@ %package javadoc Summary: Javadoc for JGoodies Forms framework -Group: Development/Languages/Java # FIXME: use proper Requires(pre/post/preun/...) +# FIXME: use proper Requires(pre/post/preun/...) +# FIXME: use proper Requires(pre/post/preun/...) +Group: Development/Languages/Java PreReq: coreutils %description javadoc @@ -122,7 +124,9 @@ %build unset CLASSPATH export CLASSPATH=%{java_home}/jre/lib/rt.jar -%{ant} compile jar javadoc +%{ant} \ + -Dbuild.compile.source=1.6 -Dbuild.compile.target=1.6 \ + compile jar javadoc %install # jars @@ -137,14 +141,16 @@ # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # demo install -dm 755 %{buildroot}%{_datadir}/%{name} cp -pr src/tutorial/* %{buildroot}%{_datadir}/%{name} cp -pr build/classes/tutorial/* %{buildroot}%{_datadir}/%{name} +%fdupes -s %{buildroot}%{_datadir}/%{name} cat > %{name}.sh << EOF #!/bin/bash cd %{_datadir}/%{name} -%{java} -cp .:%{_javadir}/forms.jar \ +%java -cp .:%{_javadir}/forms.jar \ com/jgoodies/forms/tutorial/QuickStartExample EOF install -dm 755 %{buildroot}%{_bindir} @@ -157,16 +163,13 @@ EOF %files -%defattr(-,root,root) %doc AUTHORS LICENSE.txt README.html RELEASE-NOTES.txt %{_javadir}/%{_shortname}*.jar %files javadoc -%defattr(-,root,root) %doc %{_javadocdir}/%{name} %files manual -%defattr(-,root,root,-) %doc docs/references.html %doc docs/tips.html %doc docs/visualbuilders.html @@ -176,7 +179,6 @@ %doc docs/images/ %files demo -%defattr(644,root,root,755) %doc LICENSE.txt README.html RELEASE-NOTES.txt %doc docs/tutorial %{_datadir}/%{name}
