From 7481e652ed69649e0d147034861cbf07adedfe9e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:41 +0200 Subject: [PATCH 1/6] Mass rebuild for javapackages-tools 201901 --- httpcomponents-project.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 38a2818..ca9d63d 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,7 +1,7 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents Version: 9 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/9/httpcomponents-parent-9.pom @@ -45,6 +45,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 9-3 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From bdcc2f3684cfa7a1417bb3dfe18cb5f1e9be0e3c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 May 2019 10:38:10 +0200 Subject: [PATCH 2/6] Update to upstream version 11 --- .gitignore | 1 + httpcomponents-project.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ae2b386..898ac94 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /httpcomponents-project-7.tar.xz /httpcomponents-parent-9.pom /LICENSE-2.0.txt +/httpcomponents-parent-11.pom diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index ca9d63d..959c65e 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,10 +1,10 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents -Version: 9 -Release: 3%{?dist} +Version: 11 +Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ -Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/9/httpcomponents-parent-9.pom +Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/%{version}/httpcomponents-parent-%{version}.pom Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch @@ -45,6 +45,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Wed May 29 2019 Marian Koncek - 11-1 +- Update to upstream version 11 + * Fri May 24 2019 Mikolaj Izdebski - 9-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 0af1b83..73cbe48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (httpcomponents-parent-9.pom) = 3de5f674b98e286021997641c585d7128f6e0ca192cd9c30f535c5e210d532cceb42145d6e99026c3b8fd9399ce6a4b5cd0de5bcac152ac09df2d288b10013f1 +SHA512 (httpcomponents-parent-11.pom) = bc676698caec72d525b9bf408432e9cd9c7b5d2227e0778fd79c303041cb5b07b88f98433d59c0149d6c11c27c3834722ceb283048919e467785efd7f4c399a2 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 21431a6d7e621fc254740776f5146383b090be3c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- httpcomponents-project.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 959c65e..f2b4b99 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,7 +1,7 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents Version: 11 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/%{version}/httpcomponents-parent-%{version}.pom @@ -45,6 +45,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 11-2 +- Mass rebuild for javapackages-tools 201902 + * Wed May 29 2019 Marian Koncek - 11-1 - Update to upstream version 11 From 1760eb544b37242119ae9358b001512666938201 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 18 Sep 2020 14:44:18 +0200 Subject: [PATCH 4/6] Update to upstream version 12 --- .gitignore | 1 + httpcomponents-project.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 898ac94..872ad6f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /httpcomponents-parent-9.pom /LICENSE-2.0.txt /httpcomponents-parent-11.pom +/httpcomponents-parent-12-source-release.zip diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index f2b4b99..06c1ca9 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,30 +1,27 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents -Version: 11 -Release: 2%{?dist} +Version: 12 +Release: 1%{?dist} License: ASL 2.0 -URL: http://hc.apache.org/ -Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/%{version}/httpcomponents-parent-%{version}.pom -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +URL: https://hc.apache.org/ +Source0: https://archive.apache.org/dist/httpcomponents/httpcomponents-parent/httpcomponents-parent-%{version}-source-release.zip +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) - %description Common Maven POM file for HttpComponents. This project should be required only for building dependant packages with Maven. Please don't use it as runtime requirement. %prep -%setup -q -T -c %{name} +%setup -q -n httpcomponents-parent-%{version} -cp -p %{SOURCE0} pom.xml cp -p %{SOURCE1} . -%pom_remove_plugin :buildnumber-maven-plugin %pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :maven-site-plugin @@ -45,6 +42,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Fri Sep 18 2020 Marian Koncek - 12-1 +- Update to upstream version 12 + * Tue Nov 05 2019 Mikolaj Izdebski - 11-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 73cbe48..1b3acd6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (httpcomponents-parent-11.pom) = bc676698caec72d525b9bf408432e9cd9c7b5d2227e0778fd79c303041cb5b07b88f98433d59c0149d6c11c27c3834722ceb283048919e467785efd7f4c399a2 +SHA512 (httpcomponents-parent-12-source-release.zip) = ba0cc569643439387b1a4912e7199ecaefbf836239bb389d8f0f13d93a078728100e570271eb87b17f1de2d79f295883ff2ad91953578b89b2ea45f158f2d5b1 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 84b2f44b939e0a885d3fe541e7df8d632eacba8b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 5/6] Conditionalize buildrequires in bootstrap mode --- httpcomponents-project.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 06c1ca9..857efbd 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: httpcomponents-project Summary: Common POM file for HttpComponents Version: 12 @@ -9,8 +11,12 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +%endif %description Common Maven POM file for HttpComponents. This project should be From c36ca13b95034c6d3dae491b1664dd9914c6ce63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 6/6] Turn off bootstrap mode by default --- httpcomponents-project.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 857efbd..4bd7b8b 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: httpcomponents-project Summary: Common POM file for HttpComponents