From 53a59938c2ad79ca71ff99f3d9f21073ab9a9fa7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 1/7] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 347e140..f0a133e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -624442c0c25f2ede8226e4459c3a1b7e commons-beanutils-1.9.3-src.tar.gz +SHA512 (commons-beanutils-1.9.3-src.tar.gz) = 01cccfe7fca5fdf0d6cea83e4d1701ba9cfa40c6b5e516adc9e49998a3535db813b02bec724efeedfc2f8a774fcbb4ed9500eea56ab73f9002e081e090318ea2 From 9a8580b01ad77934de0f7ccd366934bd1369e8ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:14 +0200 Subject: [PATCH 2/7] Mass rebuild for javapackages-tools 201901 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 267f20c..c71f4ba 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -54,6 +54,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ed3642f91355da0a9b73801348527d5c507ce146 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 15 Aug 2019 09:19:54 +0200 Subject: [PATCH 3/7] Update to upstream version 1.9.4 --- .gitignore | 1 + apache-commons-beanutils.spec | 20 ++++++++++---------- sources | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ac1dec2..001f6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ commons-beanutils-1.8.3-src.tar.gz /commons-beanutils-1.9.1-src.tar.gz /commons-beanutils-1.9.2-src.tar.gz /commons-beanutils-1.9.3-src.tar.gz +/commons-beanutils-1.9.4-src.tar.gz diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c71f4ba..c351000 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,14 +1,11 @@ -%global base_name beanutils -%global short_name commons-%{base_name} - -Name: apache-%{short_name} -Version: 1.9.3 -Release: 5%{?dist} +Name: apache-commons-beanutils +Version: 1.9.4 +Release: 1%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 -URL: http://commons.apache.org/%{base_name} +URL: http://commons.apache.org/beanutils BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) @@ -29,7 +26,7 @@ Summary: Javadoc for %{name} %{summary}. %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-beanutils-%{version}-src sed -i 's/\r//' *.txt %pom_remove_plugin :maven-assembly-plugin @@ -37,7 +34,7 @@ sed -i 's/\r//' *.txt %mvn_alias :{*} :@1-core :@1-bean-collections %mvn_alias :{*} org.apache.commons:@1 org.apache.commons:@1-core org.apache.commons:@1-bean-collections %mvn_file : %{name} %{name}-core %{name}-bean-collections -%mvn_file : %{short_name} %{short_name}-core %{short_name}-bean-collections +%mvn_file : commons-beanutils commons-beanutils-core commons-beanutils-bean-collections %build # Some tests fail in Koji @@ -54,6 +51,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Thu Aug 15 2019 Marian Koncek - 1.9.4-1 +- Update to upstream version 1.9.4 + * Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index f0a133e..bbd675e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-beanutils-1.9.3-src.tar.gz) = 01cccfe7fca5fdf0d6cea83e4d1701ba9cfa40c6b5e516adc9e49998a3535db813b02bec724efeedfc2f8a774fcbb4ed9500eea56ab73f9002e081e090318ea2 +SHA512 (commons-beanutils-1.9.4-src.tar.gz) = 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 From 26f0e537150107630af50376790a0d374c2f728d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 4/7] Mass rebuild for javapackages-tools 201902 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c351000..886ad71 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,6 +1,6 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -51,6 +51,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.9.4-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Aug 15 2019 Marian Koncek - 1.9.4-1 - Update to upstream version 1.9.4 From d72e7be2c12f89c8a6393ca268cebf457614c5e1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 16:36:46 +0100 Subject: [PATCH 5/7] Fix OSGi bundle symbolic name --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 886ad71..fc94034 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -38,7 +38,7 @@ sed -i 's/\r//' *.txt %build # Some tests fail in Koji -%mvn_build -f +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.beanutils %install %mvn_install From c935029edc5b7c03b3672047b56c129c405e8009 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Jul 2020 08:33:08 +0200 Subject: [PATCH 6/7] Remove unneeded BR on commons-collections-testframework --- apache-commons-beanutils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index fc94034..1d90c0c 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -9,7 +9,6 @@ Source0: http://archive.apache.org/dist/commons/beanutils/source/commons- BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-collections:commons-collections-testframework) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From c78e7cb3fdc04ce2bcb8b58b90c932a65ef154a4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 7/7] Conditionalize buildrequires in bootstrap mode --- apache-commons-beanutils.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 1d90c0c..187a185 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-beanutils Version: 1.9.4 Release: 2%{?dist} @@ -8,9 +10,13 @@ BuildArch: noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +%endif %description The scope of this package is to create a package of Java utility methods