Hello community, here is the log from the commit of package jmock for openSUSE:Factory checked in at 2017-09-23 21:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jmock (Old) and /work/SRC/openSUSE:Factory/.jmock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jmock" Sat Sep 23 21:35:06 2017 rev:17 rq:528157 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jmock/jmock.changes 2017-05-22 10:48:32.703936590 +0200 +++ /work/SRC/openSUSE:Factory/.jmock.new/jmock.changes 2017-09-23 21:35:13.721866185 +0200 @@ -1,0 +2,6 @@ +Thu Sep 21 23:31:17 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target level 1.6 +- Clean spec files and run fdupes on documentation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jmock.spec ++++++ --- /var/tmp/diff_new_pack.oaH7IT/_old 2017-09-23 21:35:15.393631077 +0200 +++ /var/tmp/diff_new_pack.oaH7IT/_new 2017-09-23 21:35:15.393631077 +0200 @@ -32,16 +32,15 @@ Patch1: jmock-1.2.0-build_xml.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit -#BuildRequires: cglib >= 2.1.3 BuildRequires: asm >= 1.5.3 BuildRequires: cglib-nohook >= 2.1.3 +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit >= 3.8.1 Requires: asm >= 1.5.3 Requires: cglib >= 2.1.3 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -100,7 +99,10 @@ %build export OPT_JAR_LIST="ant/ant-junit junit" export CLASSPATH=`pwd`/build/classes:$(build-classpath asm cglib) -ant -Dbuild.sysclasspath=only package +ant \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dbuild.sysclasspath=only \ + package %install install -Dpm 644 build/%{name}-core-%{version}.jar \ @@ -121,23 +123,21 @@ # install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/javadoc-%{version}/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # install -dm 755 %{buildroot}%{_datadir}/%{name}-%{version} cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version} %files -%defattr(0644,root,root,0755) %doc LICENSE.txt overview.html %{_javadir}/*.jar %{_mavenpomdir}/* %{_datadir}/maven-metadata/%{name}.xml* %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %files demo -%defattr(0644,root,root,0755) %{_datadir}/%{name}-%{version} %changelog ++++++ jmock-1.2.0-build_xml.patch ++++++ --- /var/tmp/diff_new_pack.oaH7IT/_old 2017-09-23 21:35:15.433625452 +0200 +++ /var/tmp/diff_new_pack.oaH7IT/_new 2017-09-23 21:35:15.433625452 +0200 @@ -1,5 +1,5 @@ ---- build.xml.sav 2007-07-15 11:18:10.000000000 +0200 -+++ build.xml 2007-07-15 11:19:51.000000000 +0200 +--- build.xml 2007-04-10 17:35:42.000000000 +0200 ++++ build.xml 2017-09-19 11:13:25.863347487 +0200 @@ -1,5 +1,5 @@ <project name="jMock 1" default="build"> - <property name="version" value="DEVELOPER-BUILD"/> @@ -7,7 +7,17 @@ <target name="build" depends="clean, package"/> -@@ -27,11 +27,13 @@ +@@ -11,8 +11,7 @@ + <mkdir dir="build/classes"/> + <javac srcdir="src" + destdir="build/classes" +- debug="true" +- source="1.3" target="1.3"> ++ debug="true"> + <classpath> + <fileset dir="lib" includes="*.jar"/> + </classpath> +@@ -27,11 +26,13 @@ <exclude name="test/**"/> <exclude name="org/jmock/cglib/**"/> </fileset> @@ -21,7 +31,7 @@ </jar> <jar destfile="build/jmock-cglib-${version}.jar"> -@@ -39,9 +41,11 @@ +@@ -39,9 +40,11 @@ <fileset dir="build/classes"> <include name="org/jmock/cglib/**"/> </fileset> @@ -33,14 +43,14 @@ </jar> <jar destfile="build/jmock-tests-${version}.jar"> -@@ -98,8 +102,8 @@ +@@ -97,9 +100,7 @@ + <javac destdir="build/testdata/classes" srcdir="testdata" debug="yes" - failonerror="yes" +- failonerror="yes" - source="1.5" - target="1.5"/> -+ source="1.4" -+ target="1.4"/> ++ failonerror="yes"/> <jar destfile="build/testdata/signed.jar" compress="false"> <fileset dir="build/testdata/classes/" includes="*"/>
