Hello community,
here is the log from the commit of package cglib for openSUSE:Factory checked in at 2018-12-07 14:30:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cglib (Old)
and /work/SRC/openSUSE:Factory/.cglib.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cglib"
Fri Dec 7 14:30:34 2018 rev:19 rq:653639 version:3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cglib/cglib.changes 2017-09-20 17:08:13.591262634 +0200
+++ /work/SRC/openSUSE:Factory/.cglib.new.19453/cglib.changes 2018-12-07 14:30:42.491420425 +0100
@@ -1,0 +2,30 @@
+Mon Oct 29 14:24:03 UTC 2018 - Fridrich Strba
+
+- Upgrade to version 3.1, the last one buildable with ant
+- Depend on asm5
+- Modified patch:
+ * cglib-build_xml.patch
+ + rediff to changed context
+- Added patch:
+ * fix-javadoc.patch
+ + Do not import with wildcards a package that has no classes
+ + Fixes javadoc generation
+
+-------------------------------------------------------------------
+Mon Oct 29 13:45:46 UTC 2018 - Fridrich Strba
+
+- Add aliases to the maven artifact
+
+-------------------------------------------------------------------
+Wed Jun 13 15:39:52 UTC 2018 - fstrba@suse.com
+
+- Depend on asm3 and not objectweb-asm, since the binaries
+ are equivalent.
+
+-------------------------------------------------------------------
+Wed May 16 09:07:44 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+ of 1.6 compatibility
+
+-------------------------------------------------------------------
Old:
----
cglib-2.2.pom
cglib-src-2.2.jar
New:
----
RELEASE_3_1.tar.gz
cglib-3.1.pom
fix-javadoc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cglib.spec ++++++
--- /var/tmp/diff_new_pack.EGK76M/_old 2018-12-07 14:30:43.047419734 +0100
+++ /var/tmp/diff_new_pack.EGK76M/_new 2018-12-07 14:30:43.051419730 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cglib
#
-# 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
@@ -12,29 +12,30 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%global tarball_name RELEASE_3_1
Name: cglib
-Version: 2.2
+Version: 3.1
Release: 0
Summary: Code Generation Library
License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://cglib.sourceforge.net/
-Source0: %{name}-src-%{version}.jar
-Source1: /%{name}-%{version}.pom
+URL: http://cglib.sourceforge.net/
+Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz
+Source1: http://central.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
# Remove the repackaging step that includes other jars into the final thing
Patch0: %{name}-build_xml.patch
+Patch1: fix-javadoc.patch
BuildRequires: ant >= 1.6
-BuildRequires: fdupes
-BuildRequires: java-devel >= 1.6.0
# Needed for maven conversions
+BuildRequires: asm5
+BuildRequires: fdupes
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
-BuildRequires: objectweb-asm
-BuildRequires: unzip
Provides: %{name}-nohook = %{version}-%{release}
Obsoletes: %{name}-nohook < %{version}-%{release}
BuildArch: noarch
@@ -54,15 +55,15 @@
runtime.
%prep
-%setup -q -T -c -n %{name}
-unzip -q %{SOURCE0}
+%setup -q -n %{name}-%{tarball_name}
rm lib/*.jar
-build-jar-repository -s -p lib objectweb-asm ant
+build-jar-repository -s -p lib asm5 ant
%patch0 -p1
+%patch1 -p1
%build
ant \
- -Dcompile.target=1.6 -Dcompile.source=1.6 \
+ -Dcompile.target=8 -Dcompile.source=8 \
jar javadoc
%install
@@ -76,12 +77,13 @@
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
#maven pom
-mkdir -p %{buildroot}%{_mavenpomdir}
-cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib"
%files
-%doc LICENSE NOTICE
+%license LICENSE
+%doc NOTICE
%{_javadir}/*.jar
%{_mavenpomdir}/*
%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml
++++++ cglib-2.2.pom -> cglib-3.1.pom ++++++
--- /work/SRC/openSUSE:Factory/cglib/cglib-2.2.pom 2012-06-13 22:47:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cglib.new.19453/cglib-3.1.pom 2018-12-07 14:30:42.303420658 +0100
@@ -4,8 +4,9 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<name>Code Generation Library</name>
- <version>2.2</version>
+ <version>3.1</version>
<url>http://cglib.sourceforge.net/</url>
+ <description>Code generation library</description>
<licenses>
<license>
<name>ASF 2.0</name>
@@ -14,18 +15,19 @@
</license>
</licenses>
<scm>
+ <connection>scm:cvs:pserver:anonymous@cglib.cvs.sourceforge.net:/cvsroot/cglib:cglib</connection>
<url>http://cglib.cvs.sourceforge.net/cglib</url>
</scm>
<dependencies>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>3.1</version>
+ <version>4.2</version>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
- <version>3.1</version>
+ <version>4.2</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -35,4 +37,18 @@
<optional>true</optional>
</dependency>
</dependencies>
+ <developers>
+ <developer>
+ <id>baliuka</id>
+ <name>Juozas Baliuka</name>
+ </developer>
+ <developer>
+ <id>herbyderby</id>
+ <name>Chris Nokleberg</name>
+ </developer>
+ <developer>
+ <id>sameb</id>
+ <name>Sam Berlin</name>
+ </developer>
+ </developers>
</project>
++++++ cglib-build_xml.patch ++++++
--- /var/tmp/diff_new_pack.EGK76M/_old 2018-12-07 14:30:43.083419690 +0100
+++ /var/tmp/diff_new_pack.EGK76M/_new 2018-12-07 14:30:43.087419685 +0100
@@ -1,13 +1,14 @@
---- cglib/build.xml.orig 2008-08-14 13:37:22.000000000 +0200
-+++ cglib/build.xml 2008-08-14 13:35:51.000000000 +0200
-@@ -124,14 +124,6 @@
+--- cglib/build.xml 2013-12-07 17:08:18.000000000 +0100
++++ cglib/build.xml 2018-10-29 15:10:26.294707872 +0100
+@@ -123,15 +123,6 @@
+ <include name="**/*"/>
<exclude name="samples/**" />
</jar>
-
+-
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
- <zipfileset dir="lib" includes="asm*.txt"/>
-- <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
+- <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/>
- <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
- <include name="**/*"/>
- <exclude name="samples/**"/>
++++++ fix-javadoc.patch ++++++
diff -urEbwB cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java
--- cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java 2013-12-07 17:08:18.000000000 +0100
+++ cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java 2018-10-29 15:15:55.528397043 +0100
@@ -16,7 +16,6 @@
package net.sf.cglib.reflect;
import java.lang.reflect.*;
-import net.sf.cglib.*;
import net.sf.cglib.core.*;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Type;