From 730c64673ac79ca01724857a35275471d1fba731 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:23 +0200 Subject: [PATCH 1/7] Mass rebuild for javapackages-tools 201901 --- objenesis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objenesis.spec b/objenesis.spec index f186d82..cf02865 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -31,7 +31,7 @@ Summary: A library for instantiating Java objects Name: objenesis Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://objenesis.org/ Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz @@ -103,6 +103,9 @@ This package contains the API documentation for %{name}. %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.6-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1dfa287fe7e13212e377aa575b978a6818f03336 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 15 Jul 2019 11:32:42 +0200 Subject: [PATCH 2/7] Update to upstream version 3.0.1 --- .gitignore | 1 + objenesis.spec | 17 +++++++---------- sources | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 308856a..9ef8c62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /objenesis-1.2.tar.xz /2.1.tar.gz /2.6.tar.gz +/3.0.1.tar.gz diff --git a/objenesis.spec b/objenesis.spec index cf02865..821caf4 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -30,17 +30,15 @@ Summary: A library for instantiating Java objects Name: objenesis -Version: 2.6 -Release: 3%{?dist} +Version: 3.0.1 +Release: 1%{?dist} License: ASL 2.0 URL: http://objenesis.org/ Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) @@ -66,7 +64,6 @@ when this is useful: * Container Frameworks - Objects can be dynamically instantiated in non-standard ways. - %package javadoc Summary: Javadoc for %{name} BuildArch: noarch @@ -74,7 +71,6 @@ BuildArch: noarch %description javadoc This package contains the API documentation for %{name}. - %prep %setup -q @@ -82,27 +78,28 @@ This package contains the API documentation for %{name}. %pom_xpath_remove pom:addMavenDescriptor %pom_remove_plugin :maven-timestamp-plugin -%pom_remove_plugin :maven-license-plugin +%pom_remove_plugin -r :maven-shade-plugin %pom_xpath_remove "pom:dependency[pom:scope='test']" tck %pom_xpath_remove pom:build/pom:extensions %build # tests are skipped because of missing dependency spring-osgi-test -%mvn_build -- -Dyear=2009 -Dmaven.test.skip=true +%mvn_build -f %install %mvn_install - %files -f .mfiles %doc LICENSE.txt %files javadoc -f .mfiles-javadoc %doc LICENSE.txt - %changelog +* Mon Jul 15 2019 Marian Koncek - 3.0.1-1 +- Update to upstream version 3.0.1 + * Fri May 24 2019 Mikolaj Izdebski - 2.6-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index cc2fdb9..7d7695d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2.6.tar.gz) = 554b191390cd990147dafc64996915ab508d2482113430da9d8989e7d23811efbd623a5c8e9d9a878536723459ac7e5091777736742e31944b611e5f2bc8772b +SHA512 (3.0.1.tar.gz) = f0cb6bfdceffb0fb63d6fd8a41409dd1f10b566c4ad8425347c26ebb9f47043ea2d00b50bdf13b20adad4d29e65d9da8c131513dd865a64a6e2c15a40e7676ef From 7a910362a6171c5d85284b8e7733fce29d29cd83 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Oct 2019 14:58:44 +0200 Subject: [PATCH 3/7] Update to upstream version 3.1 --- .gitignore | 1 + objenesis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9ef8c62..f9460d9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /2.1.tar.gz /2.6.tar.gz /3.0.1.tar.gz +/3.1.tar.gz diff --git a/objenesis.spec b/objenesis.spec index 821caf4..8e5bc86 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -30,7 +30,7 @@ Summary: A library for instantiating Java objects Name: objenesis -Version: 3.0.1 +Version: 3.1 Release: 1%{?dist} License: ASL 2.0 URL: http://objenesis.org/ @@ -97,6 +97,9 @@ This package contains the API documentation for %{name}. %doc LICENSE.txt %changelog +* Thu Oct 17 2019 Marian Koncek - 3.1-1 +- Update to upstream version 3.1 + * Mon Jul 15 2019 Marian Koncek - 3.0.1-1 - Update to upstream version 3.0.1 diff --git a/sources b/sources index 7d7695d..9cd7cce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.0.1.tar.gz) = f0cb6bfdceffb0fb63d6fd8a41409dd1f10b566c4ad8425347c26ebb9f47043ea2d00b50bdf13b20adad4d29e65d9da8c131513dd865a64a6e2c15a40e7676ef +SHA512 (3.1.tar.gz) = 371efd905a5679fedfd35c9074ad4e6c0993c37f57a901da0ca4b5e2fc860c6afa16903dd9264af22e0370c6e1bde5e9ae5922fdef989951688c1045c26464d9 From 18baea8747c3118bc8af8a1f30c4b27a3e4f3896 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Oct 2019 15:11:26 +0200 Subject: [PATCH 4/7] Remove dependency on maven-enforcer --- objenesis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/objenesis.spec b/objenesis.spec index 8e5bc86..d1a4b05 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -78,6 +78,7 @@ This package contains the API documentation for %{name}. %pom_xpath_remove pom:addMavenDescriptor %pom_remove_plugin :maven-timestamp-plugin +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin -r :maven-shade-plugin %pom_xpath_remove "pom:dependency[pom:scope='test']" tck From 17beaa443f921314e9c3940e1a26bd674e624fc5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/7] Mass rebuild for javapackages-tools 201902 --- objenesis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objenesis.spec b/objenesis.spec index d1a4b05..0848270 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -31,7 +31,7 @@ Summary: A library for instantiating Java objects Name: objenesis Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://objenesis.org/ Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz @@ -98,6 +98,9 @@ This package contains the API documentation for %{name}. %doc LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Oct 17 2019 Marian Koncek - 3.1-1 - Update to upstream version 3.1 From 427e22fca2a4bc03183323720a3e67c7baadbaba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 6/7] Conditionalize buildrequires in bootstrap mode --- objenesis.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/objenesis.spec b/objenesis.spec index 0848270..a99e955 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -37,10 +39,16 @@ URL: http://objenesis.org/ Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +%endif # xmvn-builddep misses this: +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif BuildArch: noarch From f87d865a72fb682374e522023907aea9558b99f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 7/7] Turn off bootstrap mode by default --- objenesis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objenesis.spec b/objenesis.spec index a99e955..6270b17 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap # Copyright (c) 2000-2009, JPackage Project # All rights reserved.