Hello community, here is the log from the commit of package asm2 for openSUSE:Factory checked in at 2017-09-15 22:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asm2 (Old) and /work/SRC/openSUSE:Factory/.asm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asm2" Fri Sep 15 22:31:41 2017 rev:15 rq:526290 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/asm2/asm2.changes 2011-09-23 11:36:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.asm2.new/asm2.changes 2017-09-15 22:31:42.336133120 +0200 @@ -1,0 +2,10 @@ +Fri Sep 15 08:04:09 UTC 2017 - [email protected] + +- Added patch: + * asm-2.2.3-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-2.2.3-sourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asm2.spec ++++++ --- /var/tmp/diff_new_pack.aUdipG/_old 2017-09-15 22:31:43.291998474 +0200 +++ /var/tmp/diff_new_pack.aUdipG/_new 2017-09-15 22:31:43.295997911 +0200 @@ -1,7 +1,7 @@ # # spec file for package asm2 # -# Copyright (c) 2011 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 @@ -16,21 +16,20 @@ # - Name: asm2 Version: 2.2.3 -Release: 6 +Release: 0 Summary: Java bytecode manipulation framework -Group: Development/Libraries/Java License: BSD-3-Clause +Group: Development/Libraries/Java Url: http://asm.objectweb.org/ Source: asm-2.2.3.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -BuildRequires: java-devel +Patch0: asm-2.2.3-sourcetarget.patch BuildRequires: ant -BuildRequires: objectweb-anttask BuildRequires: fdupes +BuildRequires: java-devel >= 1.6 +BuildRequires: objectweb-anttask +BuildArch: noarch %description ASM is a Java bytecode manipulation framework. @@ -43,10 +42,7 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. - - %package javadoc -License: BSD-3-Clause Summary: Java bytecode manipulation framework Group: Development/Libraries/Java @@ -61,10 +57,7 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. - - %package examples -License: BSD-3-Clause Summary: Java bytecode manipulation framework Group: Development/Libraries/Java @@ -79,10 +72,9 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. - - %prep %setup -q -n asm-%{version} +%patch0 -p1 # remove all third party jars find . -iname '*.jar' | xargs rm -rf # wrong end of line encoding @@ -91,37 +83,38 @@ 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 $RPM_BUILD_ROOT/%{_javadir}/%{name} +install -d -m 755 %{buildroot}/%{_javadir}/%{name} # jars -install -m 644 output/dist/lib/*jar $RPM_BUILD_ROOT/%{_javadir}/%{name} -(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +install -m 644 output/dist/lib/*jar %{buildroot}/%{_javadir}/%{name} +(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) install -m 644 output/dist/lib/all/asm-all-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-all-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) + %{buildroot}%{_javadir}/%{name}-all-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) # javadoc -install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version} -cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name} -%fdupes -s ${RPM_BUILD_ROOT} +install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version} +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-2.2.3-sourcetarget.patch ++++++ --- asm-2.2.3/build.xml 2006-07-05 17:32:20.000000000 +0200 +++ asm-2.2.3/build.xml 2017-09-15 10:01:01.969440218 +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"/> @@ -128,7 +131,7 @@ <target name="compile-debug" depends="init"> <mkdir dir="${out.build}/tmp"/> - <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>
