Hello community, here is the log from the commit of package jemmy for openSUSE:Factory checked in at 2017-09-20 17:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jemmy (Old) and /work/SRC/openSUSE:Factory/.jemmy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jemmy" Wed Sep 20 17:10:08 2017 rev:18 rq:527189 version:2.3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jemmy/jemmy.changes 2017-05-22 10:48:28.596515512 +0200 +++ /work/SRC/openSUSE:Factory/.jemmy.new/jemmy.changes 2017-09-20 17:10:09.210986866 +0200 @@ -1,0 +2,9 @@ +Mon Sep 18 23:11:43 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 +- Added patch: + * jemmy-nosource.patch + + Don't hardcode java source so that it can be specified from + ant's build command-line + +------------------------------------------------------------------- New: ---- jemmy-nosource.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jemmy.spec ++++++ --- /var/tmp/diff_new_pack.YLDYcV/_old 2017-09-20 17:10:09.958881585 +0200 +++ /var/tmp/diff_new_pack.YLDYcV/_new 2017-09-20 17:10:09.962881021 +0200 @@ -25,7 +25,7 @@ Version: 2.3.0.0 Release: 0 Summary: Java UI testing library -License: GPL-2.0 or CDDL-1.0 +License: GPL-2.0 OR CDDL-1.0 Group: Development/Libraries/Java Url: https://jemmy.dev.java.net # The source for this package was pulled from upstream's vcs. Use the @@ -37,8 +37,10 @@ # where <username> is a name of the user registered here: https://www.dev.java.net/servlets/Join Source0: jemmy-2.3.0.0.tar.bz2 Source1: jemmy-2.3.0.0.pom +Patch0: jemmy-nosource.patch BuildRequires: ant >= 1.6.5 -BuildRequires: java-devel >= 1.6.0 +BuildRequires: fdupes +BuildRequires: java-devel # Needed for maven conversions BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -65,11 +67,12 @@ %prep %setup -q +%patch0 -p1 find . -type f -name '*.jar' | xargs -t rm echo "Please, visit https://jemmy.dev.java.net for more info about Jemmy." > README.txt %build -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadoc %install # jar @@ -83,16 +86,15 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -a %{target_javadoc} %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(-,root,root,-) %doc README.txt %{_javadir}/*.jar %{_mavenpomdir}/* %config(noreplace) %{_datadir}/maven-metadata/%{name}.xml* %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog ++++++ jemmy-nosource.patch ++++++ diff -urEbwB jemmy-2.3.0.0/build.xml jemmy-2.3.0.0/build.xml --- jemmy-2.3.0.0/build.xml 2009-06-22 17:18:56.000000000 +0200 +++ jemmy-2.3.0.0/build.xml 2017-09-19 01:09:33.610773643 +0200 @@ -42,7 +42,7 @@ <target name="compile" depends="java,timestamp"> <filter token="BUILD_NUMBER" value="${buildnumber}"/> <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="on" source="1.5"/> + <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="on"/> <copy file="${src.dir}/org/netbeans/jemmy/debug.timeouts" todir="${build.classes.dir}/org/netbeans/jemmy"/> <copy file="${src.dir}/org/netbeans/jemmy/version_info" tofile="${build.classes.dir}/org/netbeans/jemmy/version_info" filtering="on"/> </target> @@ -68,7 +68,7 @@ </target> <target name="compile-tests" depends="compile"> <mkdir dir="${build.tests.dir}"/> - <javac srcdir="${test.dir}" destdir="${build.tests.dir}" debug="on" source="1.4" classpath="../lib/junit-4.1.jar:${build.classes.dir}"/> + <javac srcdir="${test.dir}" destdir="${build.tests.dir}" debug="on" classpath="../lib/junit-4.1.jar:${build.classes.dir}"/> <copy file="${test.dir}/org/netbeans/jemmy/testing/jemmy_012_prop1" tofile="${build.tests.dir}/org/netbeans/jemmy/testing/jemmy_012_prop1"/> <copy file="${test.dir}/org/netbeans/jemmy/testing/jemmy_012_prop2" tofile="${build.tests.dir}/org/netbeans/jemmy/testing/jemmy_012_prop2"/> <copy file="${test.dir}/org/netbeans/jemmy/testing/jemmy_013_prop1.jar" tofile="${build.tests.dir}/org/netbeans/jemmy/testing/jemmy_013_prop1.jar"/>
