Hello community, here is the log from the commit of package asm3 for openSUSE:Factory checked in at 2017-09-15 22:31:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asm3 (Old) and /work/SRC/openSUSE:Factory/.asm3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asm3" Fri Sep 15 22:31:43 2017 rev:3 rq:526293 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/asm3/asm3.changes 2014-07-23 22:06:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.asm3.new/asm3.changes 2017-09-15 22:31:43.439977629 +0200 @@ -1,0 +2,10 @@ +Fri Sep 15 08:17:16 UTC 2017 - fst...@suse.com + +- Added patch: + * asm-3.3.1-sourcetarget.patch + + Make java source and target configurable from ant command + line + + Specify encoding to avoid build breakages with jdk9 +- Fix build with jdk9: specify java source and target 1.6 + +------------------------------------------------------------------- New: ---- asm-3.3.1-sourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asm3.spec ++++++ --- /var/tmp/diff_new_pack.si7zhg/_old 2017-09-15 22:31:44.059890307 +0200 +++ /var/tmp/diff_new_pack.si7zhg/_new 2017-09-15 22:31:44.063889743 +0200 @@ -1,7 +1,7 @@ # # spec file for package asm3 # -# 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 @@ -24,11 +24,11 @@ Group: Development/Libraries/Java Url: http://asm.objectweb.org/ Source: %{name}-%{version}.tar.bz2 +Patch0: asm-3.3.1-sourcetarget.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel +BuildRequires: java-devel >= 1.6 BuildRequires: objectweb-anttask -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -44,7 +44,6 @@ %package javadoc Summary: Java bytecode manipulation framework -License: BSD-3-Clause Group: Development/Libraries/Java %description javadoc @@ -60,7 +59,6 @@ %package examples Summary: Java bytecode manipulation framework -License: BSD-3-Clause Group: Development/Libraries/Java %description examples @@ -76,6 +74,7 @@ %prep %setup -q -n asm-%{version} +%patch0 -p1 # remove all third party jars find . -iname '*.jar' | xargs rm -rf # wrong end of line encoding @@ -84,7 +83,10 @@ mkdir -p test/lib %build -ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc +ant \ + -Dcompile.source=1.6 -Dcompile.target=1.6 \ + -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) \ + jar jdoc %install install -d -m 755 %{buildroot}/%{_javadir}/%{name} @@ -101,20 +103,18 @@ cp -pr output/dist/doc/javadoc/user/* %{buildroot}/%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot} +%fdupes -s examples/ %files -%defattr(-,root,root,0755) %doc README.txt LICENSE.txt %{_javadir}/%{name}-all*.jar %{_javadir}/%{name}/ %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files examples -%defattr(-,root,root) %doc examples/* %changelog ++++++ asm-3.3.1-sourcetarget.patch ++++++ --- asm-3.3.1/build.xml 2009-07-11 17:56:57.000000000 +0200 +++ asm-3.3.1/build.xml 2017-09-15 10:13:45.661384846 +0200 @@ -48,6 +48,9 @@ <property name="config" value="${basedir}/config"/> <property name="archive" value="${basedir}/archive"/> + <property name="compile.source" value="${basedir}/config"/> + <property name="compile.target" value="${basedir}/archive"/> + <property name="out" value="${basedir}/output"/> <property name="out.build" value="${out}/build"/> <property name="out.instr" value="${out}/instr"/> @@ -170,7 +173,7 @@ </target> <target name="compile-debug" depends="init,compile-init,compile-config"> - <javac destdir="${out.build}/tmp" debug="on" source="1.3" target="1.2"> + <javac destdir="${out.build}/tmp" debug="on" source="${compile.source}" target="${compile.target}" encoding="ISO-8859-1"> <classpath> <pathelement location="${out.build}/tmp"/> </classpath>
