Hello community, here is the log from the commit of package asm for openSUSE:Factory checked in at 2018-07-24 17:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asm (Old) and /work/SRC/openSUSE:Factory/.asm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asm" Tue Jul 24 17:30:56 2018 rev:19 rq:620763 version:1.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/asm/asm.changes 2017-09-13 22:19:17.280921690 +0200 +++ /work/SRC/openSUSE:Factory/.asm.new/asm.changes 2018-07-24 17:30:59.759956687 +0200 @@ -1,0 +2,8 @@ +Wed May 16 05:47:07 UTC 2018 - fst...@suse.com + +- Added patch: + * asm-1.5.3-jdk9.patch + + "_" is keyword from jdk9 +- Run fdupes on documentation + +------------------------------------------------------------------- New: ---- asm-1.5.3-jdk9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asm.spec ++++++ --- /var/tmp/diff_new_pack.ysHauw/_old 2018-07-24 17:31:00.319957394 +0200 +++ /var/tmp/diff_new_pack.ysHauw/_new 2018-07-24 17:31:00.323957400 +0200 @@ -1,7 +1,7 @@ # # spec file for package asm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,7 +27,10 @@ Source1: http://asm.objectweb.org/current/asm-eng.pdf Source2: http://asm.objectweb.org/doc/faq.html Patch0: %{name}-java16compat.patch +Patch1: asm-1.5.3-jdk9.patch BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: objectweb-anttask BuildRequires: xml-commons-apis BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,6 +57,7 @@ %prep %setup -q %patch0 +%patch1 -p1 find . -name "*.jar" -exec rm -f {} \; install -m 644 %{SOURCE1} . install -m 644 %{SOURCE2} . @@ -66,13 +70,14 @@ install -d -m 755 %{buildroot}%{_javadir}/%{name} for jar in output/dist/lib/*.jar; do install -m 644 ${jar} \ -%{buildroot}%{_javadir}/%{name}/`basename ${jar}` + %{buildroot}%{_javadir}/%{name}/`basename ${jar}` done (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do \ ln -sf ${jar} ${jar/-%{version}/}; done) # javadoc install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) ++++++ asm-1.5.3-jdk9.patch ++++++ diff -urEbwB asm-1.5.3/src/org/objectweb/asm/util/CheckCodeAdapter.java asm-1.5.3.new/src/org/objectweb/asm/util/CheckCodeAdapter.java --- asm-1.5.3/src/org/objectweb/asm/util/CheckCodeAdapter.java 2004-03-19 14:39:10.000000000 +0100 +++ asm-1.5.3.new/src/org/objectweb/asm/util/CheckCodeAdapter.java 2018-05-16 07:38:33.742328672 +0200 @@ -722,7 +722,7 @@ checkIdentifier(name, begin, slash, null); begin = slash + 1; } while (slash != max); - } catch (IllegalArgumentException _) { + } catch (IllegalArgumentException e) { throw new IllegalArgumentException( "Invalid " + msg + " (must be a fully qualified class name in internal form): " + @@ -796,7 +796,7 @@ } try { checkInternalName(desc, start + 1, index, null); - } catch (IllegalArgumentException _) { + } catch (IllegalArgumentException e) { throw new IllegalArgumentException("Invalid descriptor: " + desc); } return index + 1; ++++++ asm-java16compat.patch ++++++ --- /var/tmp/diff_new_pack.ysHauw/_old 2018-07-24 17:31:00.383957475 +0200 +++ /var/tmp/diff_new_pack.ysHauw/_new 2018-07-24 17:31:00.387957480 +0200 @@ -7,7 +7,7 @@ <mkdir dir="${out.build}"/> - <javac destdir="${out.build}" optimize="on"> + <javac destdir="${out.build}" optimize="on" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="classpath"/> <src path="${src}"/> <include name="**/*.java"/> @@ -20,10 +20,22 @@ <mkdir dir="${build}"/> - <javac srcdir="${src}" destdir="${build}" debug="on"> + <javac srcdir="${src}" destdir="${build}" debug="on" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="classpath"/> <include name="**/*.java"/> </javac> +diff -Naur ../asm-1.5.3.orig/jdoc/user.xml ./jdoc/user.xml +--- ../asm-1.5.3.orig/jdoc/user.xml 2004-04-06 06:14:22.000000000 +0200 ++++ ./jdoc/user.xml 2018-05-16 07:35:05.333298737 +0200 +@@ -12,7 +12,7 @@ + + <target name="dist.jdoc.user" unless="jdoc.required"> + <mkdir dir="${jdoc.dir}"/> +- <javadoc destdir="${jdoc.dir}" ++ <javadoc destdir="${jdoc.dir}" source="6" + windowtitle="ASM Documentation" + doctitle="ASM Documentation"> + diff -Naur ../asm-1.5.3.orig/test/build.xml ./test/build.xml --- ../asm-1.5.3.orig/test/build.xml 2004-09-14 11:38:11.000000000 +0200 +++ ./test/build.xml 2006-09-22 15:00:11.000000000 +0200 @@ -33,7 +45,7 @@ <mkdir dir="${out.test}"/> - <javac srcdir="${test.conform}" destdir="${out.test}"> + <javac srcdir="${test.conform}" destdir="${out.test}" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="test.classpath"/> <include name="**/*.java"/> </javac> @@ -43,7 +55,7 @@ <mkdir dir="${out.test}"/> - <javac srcdir="${test.deviance}" destdir="${out.test}"> + <javac srcdir="${test.deviance}" destdir="${out.test}" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="test.classpath"/> <include name="**/*.java"/> </javac> @@ -53,7 +65,7 @@ <mkdir dir="${out.test}"/> - <javac srcdir="${test.thread}" destdir="${out.test}"> + <javac srcdir="${test.thread}" destdir="${out.test}" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="test.classpath"/> <include name="**/*.java"/> </javac> @@ -63,7 +75,7 @@ <mkdir dir="${out.test}"/> - <javac srcdir="${test.stress}" destdir="${out.test}"> + <javac srcdir="${test.stress}" destdir="${out.test}" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="test.classpath"/> <include name="**/*.java"/> </javac> @@ -73,7 +85,7 @@ <mkdir dir="${out.test}"/> - <javac srcdir="${test.perf}" destdir="${out.test}"> + <javac srcdir="${test.perf}" destdir="${out.test}" -+ target="1.6" source="1.6"> ++ target="6" source="6"> <classpath refid="test.classpath"/> <include name="**/*.java"/> </javac>
