From a11ffa07d5dd595bac20d3f9e173587cb2d88707 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/10] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e4f4c0e..c1dd107 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c070bfb4037b37d0334c1f4af447872f RELEASE_3_2_4.tar.gz +SHA512 (RELEASE_3_2_4.tar.gz) = fd6b0c0b1969968d063fa642a95feaddee27217b96edc16ef23fa870f0fbf5c182e4a92f4790cb62420f7aad2c6d1df4ef993b0586879108aeb443e90ecb4771 From 1eabedc1be8eb9213b57c18b1585c7940bfbd897 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:28 +0200 Subject: [PATCH 02/10] Mass rebuild for javapackages-tools 201901 --- cglib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cglib.spec b/cglib.spec index b1e5546..d8f3a49 100644 --- a/cglib.spec +++ b/cglib.spec @@ -2,7 +2,7 @@ Name: cglib Version: 3.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Code Generation Library for Java # ASM MethodVisitor is based on ASM code and therefore # BSD-licensed. Everything else is ASL 2.0. @@ -71,6 +71,9 @@ Documentation for the cglib code generation library. %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.2.9-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Jan 31 2019 Fedora Release Engineering - 3.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d17cd9259e93cb592c8f19f76aa4cc35ab1a999b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 27 Jun 2019 09:56:47 +0200 Subject: [PATCH 03/10] Update to upstream version 3.2.12 --- .gitignore | 1 + cglib.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5711d27..08ef398 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ cglib-src-2.2.jar /RELEASE_3_2_4.tar.gz /cglib-RELEASE_3_2_4 /RELEASE_3_2_9.tar.gz +/RELEASE_3_2_12.tar.gz diff --git a/cglib.spec b/cglib.spec index d8f3a49..ef9f6ed 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,8 +1,8 @@ -%global tarball_name RELEASE_3_2_9 +%global tarball_name RELEASE_%(echo '%{version}' | tr . _) Name: cglib -Version: 3.2.9 -Release: 3%{?dist} +Version: 3.2.12 +Release: 1%{?dist} Summary: Code Generation Library for Java # ASM MethodVisitor is based on ASM code and therefore # BSD-licensed. Everything else is ASL 2.0. @@ -54,8 +54,6 @@ Documentation for the cglib code generation library. %pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample %pom_remove_plugin -r :maven-javadoc-plugin -%pom_xpath_inject "pom:dependency[pom:artifactId='ant']" "true" cglib - %mvn_alias :cglib "net.sf.cglib:cglib" "cglib:cglib-full" "cglib:cglib-nodep" "org.sonatype.sisu.inject:cglib" %build @@ -71,6 +69,9 @@ Documentation for the cglib code generation library. %license LICENSE NOTICE %changelog +* Thu Jun 27 2019 Marian Koncek - 3.2.12-1 +- Update to upstream version 3.2.12 + * Fri May 24 2019 Mikolaj Izdebski - 3.2.9-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 1c68b09..d3f0727 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (RELEASE_3_2_9.tar.gz) = 92eaf38cc5cc70932292a0e837eb4e547c4e9f10d6fd4634ee44f9fbdf03522071d6230fda35efc9eb4b4dd9f8925f3ba7f24e9379c83ef45b798e342d66db3c +SHA512 (RELEASE_3_2_12.tar.gz) = 7caaf3d1874feecd7448f093426ae4727ff0b9b9d78800551d7ccd1f061fbdd71a9eb17ef47bdd0d15dcf72207ad3f364dddda3eb231126d81d5d86d69c2cdb3 From bc81c6b3f401e2371e7ed68b245fbed4c649ff23 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 15 Aug 2019 14:44:48 +0200 Subject: [PATCH 04/10] Update to upstream version 3.3.0 --- .gitignore | 1 + cglib.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08ef398..4ae91f5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ cglib-src-2.2.jar /cglib-RELEASE_3_2_4 /RELEASE_3_2_9.tar.gz /RELEASE_3_2_12.tar.gz +/RELEASE_3_3_0.tar.gz diff --git a/cglib.spec b/cglib.spec index ef9f6ed..c8c44cb 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,7 +1,7 @@ %global tarball_name RELEASE_%(echo '%{version}' | tr . _) Name: cglib -Version: 3.2.12 +Version: 3.3.0 Release: 1%{?dist} Summary: Code Generation Library for Java # ASM MethodVisitor is based on ASM code and therefore @@ -69,6 +69,9 @@ Documentation for the cglib code generation library. %license LICENSE NOTICE %changelog +* Thu Aug 15 2019 Marian Koncek - 3.3.0-1 +- Update to upstream version 3.3.0 + * Thu Jun 27 2019 Marian Koncek - 3.2.12-1 - Update to upstream version 3.2.12 diff --git a/sources b/sources index d3f0727..7957f99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (RELEASE_3_2_12.tar.gz) = 7caaf3d1874feecd7448f093426ae4727ff0b9b9d78800551d7ccd1f061fbdd71a9eb17ef47bdd0d15dcf72207ad3f364dddda3eb231126d81d5d86d69c2cdb3 +SHA512 (RELEASE_3_3_0.tar.gz) = 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a From c21f2d84180ba94fcfc21aeebf7b4639f9463709 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 08:04:23 +0100 Subject: [PATCH 05/10] Skip running tests --- cglib.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cglib.spec b/cglib.spec index c8c44cb..8486334 100644 --- a/cglib.spec +++ b/cglib.spec @@ -57,7 +57,9 @@ Documentation for the cglib code generation library. %mvn_alias :cglib "net.sf.cglib:cglib" "cglib:cglib-full" "cglib:cglib-nodep" "org.sonatype.sisu.inject:cglib" %build -%mvn_build +# 5 tests fail with OpenJDK 11 +# Forwarded upstream: https://github.com/cglib/cglib/issues/119 +%mvn_build -f %install %mvn_install From 74e1c150710493af0aab480c6b398f7489b438bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 08:48:40 +0100 Subject: [PATCH 06/10] Remove unused import --- 0001-Remove-unused-import.patch | 24 ++++++++++++++++++++++++ cglib.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-Remove-unused-import.patch diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch new file mode 100644 index 0000000..9dd3e83 --- /dev/null +++ b/0001-Remove-unused-import.patch @@ -0,0 +1,24 @@ +From 912eaec202f33f8a0a9832bb3551674b6788e7f0 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 5 Nov 2019 08:47:50 +0100 +Subject: [PATCH] Remove unused import + +--- + cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java b/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java +index e7de82b..1f1f744 100644 +--- a/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java ++++ b/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java +@@ -17,7 +17,6 @@ package net.sf.cglib.reflect; + + import java.lang.reflect.*; + import java.security.ProtectionDomain; +-import net.sf.cglib.*; + import net.sf.cglib.core.*; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.Type; +-- +2.21.0 + diff --git a/cglib.spec b/cglib.spec index 8486334..923f4cf 100644 --- a/cglib.spec +++ b/cglib.spec @@ -8,9 +8,12 @@ Summary: Code Generation Library for Java # BSD-licensed. Everything else is ASL 2.0. License: ASL 2.0 and BSD URL: https://github.com/cglib/cglib -Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz BuildArch: noarch +Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz + +Patch0: 0001-Remove-unused-import.patch + BuildRequires: maven-local BuildRequires: maven-plugin-bundle BuildRequires: javapackages-local @@ -32,6 +35,7 @@ Documentation for the cglib code generation library. %prep %setup -q -n %{name}-%{tarball_name} +%patch0 -p1 %pom_disable_module cglib-nodep %pom_disable_module cglib-integration-test From 1e398588ccb5039e450eaf1d1c76578b49dc0d8e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 08:50:10 +0100 Subject: [PATCH 07/10] Regenerate buildrequires --- cglib.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cglib.spec b/cglib.spec index 923f4cf..4e7b21b 100644 --- a/cglib.spec +++ b/cglib.spec @@ -15,11 +15,9 @@ Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz Patch0: 0001-Remove-unused-import.patch BuildRequires: maven-local -BuildRequires: maven-plugin-bundle -BuildRequires: javapackages-local BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) %description From d742c6cbc02813764fe7877bb6c288d42c086dcd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 08/10] Mass rebuild for javapackages-tools 201902 --- cglib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cglib.spec b/cglib.spec index 4e7b21b..1b493b5 100644 --- a/cglib.spec +++ b/cglib.spec @@ -2,7 +2,7 @@ Name: cglib Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Code Generation Library for Java # ASM MethodVisitor is based on ASM code and therefore # BSD-licensed. Everything else is ASL 2.0. @@ -73,6 +73,9 @@ Documentation for the cglib code generation library. %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Aug 15 2019 Marian Koncek - 3.3.0-1 - Update to upstream version 3.3.0 From 29af927d99d322fdeff616be3db532148aca7abe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- cglib.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cglib.spec b/cglib.spec index 1b493b5..10855a8 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + %global tarball_name RELEASE_%(echo '%{version}' | tr . _) Name: cglib @@ -15,10 +17,14 @@ Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz Patch0: 0001-Remove-unused-import.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +%endif %description cglib is a powerful, high performance and quality code generation library From abd1b3aa914e166d759e9b3d9225be6ebbf6e182 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- cglib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cglib.spec b/cglib.spec index 10855a8..1ef5651 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global tarball_name RELEASE_%(echo '%{version}' | tr . _)