Hello community, here is the log from the commit of package jarjar for openSUSE:Factory checked in at 2018-07-27 10:57:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jarjar (Old) and /work/SRC/openSUSE:Factory/.jarjar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jarjar" Fri Jul 27 10:57:08 2018 rev:17 rq:625408 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/jarjar/jarjar.changes 2017-09-20 17:09:07.647653120 +0200 +++ /work/SRC/openSUSE:Factory/.jarjar.new/jarjar.changes 2018-07-27 10:58:12.789872884 +0200 @@ -1,0 +2,18 @@ +Thu Jul 26 10:50:50 UTC 2018 - [email protected] + +- Use noun phrasing in summaries; trim bias from descriptions. +- Remove one idempotent %if..%endif pair. + +------------------------------------------------------------------- +Wed Jun 13 11:58:28 UTC 2018 - [email protected] + +- Upgrade to upstream version 1.4 +- Added patch: + * do-not-embed-asm.patch + + modify upstream build so that it does not embed the asm + inside the jarjar jar files +- Require asm5 for build since we want to be able to support java 8 + bytecode +- Build with java source and target 8 + +------------------------------------------------------------------- Old: ---- jarjar-0.9.pom jarjar-src-0.9.zip New: ---- do-not-embed-asm.patch jarjar-src-1.4.zip jarjar.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jarjar.spec ++++++ --- /var/tmp/diff_new_pack.A7c0DO/_old 2018-07-27 10:58:13.265873795 +0200 +++ /var/tmp/diff_new_pack.A7c0DO/_new 2018-07-27 10:58:13.269873803 +0200 @@ -1,7 +1,7 @@ # # spec file for package jarjar # -# 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 @@ -18,27 +18,28 @@ %define section free Name: jarjar -Version: 0.9 +Version: 1.4 Release: 0 -Summary: Repackage Java libraries -License: GPL-2.0+ +Summary: Tool to repackage Java libraries +License: GPL-2.0-or-later Group: Development/Libraries/Java Url: http://tonicsystems.com/products/jarjar/ -Source0: http://downloads.sourceforge.net/jarjar/jarjar-src-0.9.zip -Source1: jarjar-0.9.pom +Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/%{name}/%{name}-src-%{version}.zip +Source1: jarjar.pom Source2: jarjar-util.pom +Patch0: do-not-embed-asm.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 -BuildRequires: asm2 +BuildRequires: asm5 BuildRequires: fdupes -BuildRequires: gnu-regexp -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: unzip -Requires: asm2 +Requires: asm5 Requires: gnu-regexp +Requires: objectweb-anttask Requires(post): javapackages-tools Requires(postun): javapackages-tools BuildArch: noarch @@ -54,7 +55,6 @@ specific version of a library, which may conflict with the dependencies of another library. -%if 0 %package maven2-plugin Summary: Maven2 plugin for %{name} # FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; @@ -65,41 +65,36 @@ %description maven2-plugin %{summary}. -%endif %package javadoc -Summary: Repackage Java libraries +Summary: Tool to repackage Java libraries Group: Development/Libraries/Java %description javadoc -Jar Jar Links is a utility that makes it easy to repackage Java -libraries and embed them into your own distribution. This is useful for -two reasons: You can easily ship a single jar file with no external -dependencies. You can avoid problems where your library depends on a -specific version of a library, which may conflict with the dependencies -of another library. +Jar Jar Links is a utility that repackages Java libraries and embeds +them into a distribution of its own. This is useful for two reasons: +You can easily ship a single jar file with no external dependencies. +You can avoid problems where your library depends on a specific +version of a library, which may conflict with the dependencies of +another library. %prep %setup -q +%patch0 -p0 # remove all binary libs -find . -name "*.jar" | xargs -t rm +rm -f lib/*.jar # maven plugin -find . -name JarJarMojo.java | xargs rm -rf +find . -name JarJarMojo.java -delete %build pushd lib -ln -sf $(build-classpath gnu.regexp) gnu-regexp.jar -ln -sf $(build-classpath asm2/asm) asm.jar -ln -sf $(build-classpath asm2/asm-commons) asm-commons.jar -ln -sf $(build-classpath asm2/asm-util) asm-util.jar +ln -sf $(build-classpath asm5/asm) asm-4.0.jar +ln -sf $(build-classpath asm5/asm-commons) asm-commons-4.0.jar ln -sf $(build-classpath ant) ant.jar -%if 0 -ln -sf $(build-classpath maven2/plugin-api) maven-plugin-api.jar -%endif popd export OPT_JAR_LIST="ant/ant-junit junit" ant \ - -Dcompile.source=1.6 -Dcompile.target=1.6 \ + -Dcompile.source=8 -Dcompile.target=8 \ jar jar-util javadoc mojo test %install ++++++ do-not-embed-asm.patch ++++++ --- build.xml.orig 2014-12-18 21:38:42.035192783 +0000 +++ build.xml 2014-12-18 21:39:34.233460061 +0000 @@ -95,15 +95,9 @@ <mkdir dir="dist"/> <jarjar jarfile="${jarfile}"> <fileset dir="build/main"/> - <zipfileset src="lib/asm-4.0.jar"/> - <zipfileset src="lib/asm-commons-4.0.jar"> - <include name="org/objectweb/asm/commons/Remap*.class"/> - <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> - </zipfileset> <keep pattern="com.tonicsystems.jarjar.Main"/> <keep pattern="com.tonicsystems.jarjar.JarJarTask"/> <rule pattern="com.tonicsystems.jarjar.util.**" result="com.tonicsystems.jarjar.ext_util.@1"/> - <rule pattern="org.objectweb.asm.**" result="com.tonicsystems.jarjar.asm.@1"/> <manifest> <attribute name="Main-Class" value="com.tonicsystems.jarjar.Main"/> <attribute name="Implementation-Version" value="${version}"/> @@ -199,7 +199,7 @@ </target> <target name="test-rejar" depends="jar"> - <taskdef name="jarjar2" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${jarfile}"/> + <taskdef name="jarjar2" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${jarfile}:lib/asm-4.0.jar:lib/asm-commons-4.0.jar"/> <delete file="${test.jar}"/> <jarjar2 jarfile="${test.jar}"> <fileset dir="build/main"/> ++++++ jarjar-util.pom ++++++ --- /var/tmp/diff_new_pack.A7c0DO/_old 2018-07-27 10:58:13.305873871 +0200 +++ /var/tmp/diff_new_pack.A7c0DO/_new 2018-07-27 10:58:13.305873871 +0200 @@ -2,12 +2,24 @@ <modelVersion>4.0.0</modelVersion> <groupId>tonic</groupId> <artifactId>jarjar-util</artifactId> - <version>0.9</version> + <version>1.4</version> <distributionManagement> <relocation> <groupId>com.tonicsystems</groupId> <artifactId>jarjar-util</artifactId> - <version>0.9</version> + <version>1.4</version> </relocation> </distributionManagement> + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>5.0.3</version> + </dependency> + </dependencies> </project> ++++++ jarjar-0.9.pom -> jarjar.pom ++++++ --- /work/SRC/openSUSE:Factory/jarjar/jarjar-0.9.pom 2011-09-23 02:04:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jarjar.new/jarjar.pom 2018-07-27 10:58:12.801872907 +0200 @@ -2,12 +2,24 @@ <modelVersion>4.0.0</modelVersion> <groupId>tonic</groupId> <artifactId>jarjar</artifactId> - <version>0.9</version> + <version>1.4</version> <distributionManagement> <relocation> <groupId>com.tonicsystems</groupId> <artifactId>jarjar</artifactId> - <version>0.9</version> + <version>1.4</version> </relocation> </distributionManagement> + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>5.0.3</version> + </dependency> + </dependencies> </project>
