From 5edbcc79a79ab3e6fb1df4a0dbf7cd5095df928d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/21] Expand conditionals --- httpcomponents-client.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 6824b7b..f048e3b 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,5 +1,3 @@ -%bcond_without memcached -%bcond_without ehcache Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore @@ -17,12 +15,6 @@ BuildRequires: maven-local BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) -%if %{with ehcache} -BuildRequires: mvn(net.sf.ehcache:ehcache-core) -%endif -%if %{with memcached} -BuildRequires: mvn(net.spy:spymemcached) -%endif BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.httpcomponents:project:pom:) @@ -158,14 +150,10 @@ done # requires network rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java -%if %{without memcached} rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/memcached %pom_remove_dep :spymemcached httpclient-cache -%endif -%if %{without ehcache} rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %pom_remove_dep :ehcache-core httpclient-cache -%endif %build %mvn_file ":{*}" httpcomponents/@1 From 1127062070a94a3059da1af348afe93a3a6043c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 02/21] Remove Obsoletes --- httpcomponents-client.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index f048e3b..4cb37a6 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -25,7 +25,6 @@ BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: publicsuffix-list Requires: publicsuffix-list -Obsoletes: %{name}-tests < 4.4 %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on From 11d8af7ce116fa8c0fc74d3c0c37c401ffdc86b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 18:23:01 +0200 Subject: [PATCH 03/21] Update to upstream version 4.5.8 --- .gitignore | 1 + httpcomponents-client.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6cedfc9..64d05bf 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.5.5-src.tar.gz /httpcomponents-client-4.5.6-src.tar.gz /httpcomponents-client-4.5.7-src.tar.gz +/httpcomponents-client-4.5.8-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index d913035..74b4c8e 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,6 @@ - Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.5.7 +Version: 4.5.8 Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ @@ -162,6 +161,9 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %doc LICENSE.txt NOTICE.txt %changelog +* Mon May 13 2019 Mikolaj Izdebski - 4.5.8-1 +- Update to upstream version 4.5.8 + * Mon Feb 04 2019 Marian Koncek - 4.5.7-1 - Update to upstream version 4.5.7 - Fixes: RHBZ #1669148 diff --git a/sources b/sources index fd0582c..55fdc20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpcomponents-client-4.5.7-src.tar.gz) = a02717894d519ff88ec988f2cadd2b53832d7bf1ba87f54ccc3922d0ca62ce349e32d297611720aa993d7214564e43ab5471f7405e724499d354052617818680 +SHA512 (httpcomponents-client-4.5.8-src.tar.gz) = 0730de98696dd97b669a157a1fdfb74a56d21d9dc04266ffe80e06a02cf5463ac85130262dc91fcc27ac6672ba38c51f6f5379e4667959254377d2cb8b6ddd19 From 60558cc3c693287df9ec3d7593804a9257ca3d91 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 11:38:17 +0200 Subject: [PATCH 04/21] Skip tests for now --- httpcomponents-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 74b4c8e..4b40152 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -146,7 +146,7 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %build %mvn_file ":{*}" httpcomponents/@1 -%mvn_build +%mvn_build -f %install %mvn_install From ca3cec596de6a1aa8486743778b1860ca6599f59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 22 May 2019 09:31:06 +0200 Subject: [PATCH 05/21] Revert "Skip tests for now" This reverts commit 60558cc3c693287df9ec3d7593804a9257ca3d91. --- httpcomponents-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 4b40152..74b4c8e 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -146,7 +146,7 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %build %mvn_file ":{*}" httpcomponents/@1 -%mvn_build -f +%mvn_build %install %mvn_install From 2741a897773809c13d3591597a88792cc2835038 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:39 +0200 Subject: [PATCH 06/21] Mass rebuild for javapackages-tools 201901 --- httpcomponents-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 74b4c8e..5b3bf02 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.5.8 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -161,6 +161,9 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 4.5.8-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 4.5.8-1 - Update to upstream version 4.5.8 From 7f6a45eda3f5a0449e5b128adbc450543d0c73b1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:34:00 +0200 Subject: [PATCH 07/21] Use javadoc_package macro --- httpcomponents-client.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 5b3bf02..a55e38f 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -5,12 +5,11 @@ Release: 2%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz +BuildArch: noarch Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch1: 0002-Port-to-mockito-2.patch -BuildArch: noarch - BuildRequires: maven-local BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) @@ -40,11 +39,7 @@ Summary: Cache module for %{name} %description cache This package provides client side caching for %{name}. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{version} @@ -151,15 +146,12 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %install %mvn_install - %files -f .mfiles -%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt +%license LICENSE.txt NOTICE.txt +%doc README.txt RELEASE_NOTES.txt %files cache -f .mfiles-cache -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt - %changelog * Fri May 24 2019 Mikolaj Izdebski - 4.5.8-2 - Mass rebuild for javapackages-tools 201901 From b8fbd3c43d299084bf892b60e33b0a73df4acad0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:34:29 +0200 Subject: [PATCH 08/21] Declare module package --- httpcomponents-client.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index a55e38f..08875d9 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -39,6 +39,7 @@ Summary: Cache module for %{name} %description cache This package provides client side caching for %{name}. +%{?module_package} %{?javadoc_package} %prep @@ -146,7 +147,7 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %doc README.txt RELEASE_NOTES.txt From 2d8b6c35540401fc1effe65c5a2b822d717132d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:35:40 +0200 Subject: [PATCH 09/21] Namespace buildrequires --- httpcomponents-client.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 08875d9..214433a 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -11,11 +11,11 @@ Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch1: 0002-Port-to-mockito-2.patch BuildRequires: maven-local -BuildRequires: mvn(commons-codec:commons-codec) -BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: %{?module_prefix}mvn(commons-codec:commons-codec) +BuildRequires: %{?module_prefix}mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.httpcomponents:httpcore) +BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.httpcomponents:project:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.easymock:easymock) From f2eec7b1c4f8ec350b19bb072d7aa96143517494 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 09:32:57 +0200 Subject: [PATCH 10/21] Fix requires on publicsuffix-list --- httpcomponents-client.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 214433a..5b8a12a 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -21,9 +21,18 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.mockito:mockito-core) +%if 0%{?module_prefix:1} +%package -n %{module_prefix}-%{name} +Summary: %{summary} +%endif + BuildRequires: publicsuffix-list Requires: publicsuffix-list +%if 0%{?module_prefix:1} +%description -n %{module_prefix}-%{name} +%{summary}. +%endif %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on @@ -39,7 +48,6 @@ Summary: Cache module for %{name} %description cache This package provides client side caching for %{name}. -%{?module_package} %{?javadoc_package} %prep From b639801ca2c3e43c5338996b02d1743a02677a03 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 09:38:26 +0200 Subject: [PATCH 11/21] Fix a typo --- httpcomponents-client.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 5b8a12a..41ca74f 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -22,7 +22,7 @@ BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.mockito:mockito-core) %if 0%{?module_prefix:1} -%package -n %{module_prefix}-%{name} +%package -n %{module_prefix}%{name} Summary: %{summary} %endif @@ -30,7 +30,7 @@ BuildRequires: publicsuffix-list Requires: publicsuffix-list %if 0%{?module_prefix:1} -%description -n %{module_prefix}-%{name} +%description -n %{module_prefix}%{name} %{summary}. %endif From 7870511cd501d641fa68193d318df06db0f67029 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 10:20:07 +0200 Subject: [PATCH 12/21] Change scope of commons-logging dependency to provided --- httpcomponents-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 41ca74f..cbe24ae 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -12,7 +12,7 @@ Patch1: 0002-Port-to-mockito-2.patch BuildRequires: maven-local BuildRequires: %{?module_prefix}mvn(commons-codec:commons-codec) -BuildRequires: %{?module_prefix}mvn(commons-logging:commons-logging) +BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) @@ -58,6 +58,9 @@ This package provides client side caching for %{name}. %mvn_package :::tests: __noinstall %mvn_package :httpclient-cache cache +# Change scope of commons-logging to provided +%pom_change_dep :commons-logging :::provided + # Remove optional build deps not available in Fedora %pom_disable_module httpclient-osgi %pom_disable_module httpclient-win From 7dd442408776a297ddab93f7163a3e7cac5d4e82 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 10:35:14 +0200 Subject: [PATCH 13/21] Disable unneeded modules --- httpcomponents-client.spec | 44 +++----------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index cbe24ae..c943535 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -42,12 +42,6 @@ management. HttpComponents Client is a successor of and replacement for Commons HttpClient 3.x. Users of Commons HttpClient are strongly encouraged to upgrade. -%package cache -Summary: Cache module for %{name} - -%description cache -This package provides client side caching for %{name}. - %{?javadoc_package} %prep @@ -56,7 +50,6 @@ This package provides client side caching for %{name}. %patch1 -p1 %mvn_package :::tests: __noinstall -%mvn_package :httpclient-cache cache # Change scope of commons-logging to provided %pom_change_dep :commons-logging :::provided @@ -64,6 +57,9 @@ This package provides client side caching for %{name}. # Remove optional build deps not available in Fedora %pom_disable_module httpclient-osgi %pom_disable_module httpclient-win +%pom_disable_module fluent-hc +%pom_disable_module httpmime +%pom_disable_module httpclient-cache %pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :maven-checkstyle-plugin @@ -75,13 +71,6 @@ This package provides client side caching for %{name}. # Fails due to strict crypto policy - uses DSA in test data rm httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java -# Don't compile/run httpclient-cache tests - they are incompatible with EasyMock 3.3 -%pom_remove_dep org.easymock:easymockclassextension -for dep in org.easymock:easymockclassextension org.slf4j:slf4j-jcl; do - %pom_remove_dep $dep httpclient-cache -done -rm -rf httpclient-cache/src/test - %pom_remove_plugin :download-maven-plugin httpclient %pom_xpath_inject "pom:archive" " @@ -122,34 +111,9 @@ rm -rf httpclient-cache/src/test " httpclient -%pom_xpath_inject pom:build " - - - - org.apache.felix - maven-bundle-plugin - true - - - * - net.sf.ehcache;resolution:=optional,net.spy.memcached;resolution:=optional,* - - <_nouses>true - - true - - - -" httpclient-cache - # requires network rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java -rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/memcached -%pom_remove_dep :spymemcached httpclient-cache -rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache -%pom_remove_dep :ehcache-core httpclient-cache - %build %mvn_file ":{*}" httpcomponents/@1 @@ -162,8 +126,6 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %license LICENSE.txt NOTICE.txt %doc README.txt RELEASE_NOTES.txt -%files cache -f .mfiles-cache - %changelog * Fri May 24 2019 Mikolaj Izdebski - 4.5.8-2 - Mass rebuild for javapackages-tools 201901 From f68210e6df78b42369b7857eb340ed17d93c6e4b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 10:47:24 +0200 Subject: [PATCH 14/21] Change scope of commons-logging in the right Maven module --- httpcomponents-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index c943535..bb6409f 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -52,7 +52,7 @@ encouraged to upgrade. %mvn_package :::tests: __noinstall # Change scope of commons-logging to provided -%pom_change_dep :commons-logging :::provided +%pom_change_dep :commons-logging :::provided httpclient # Remove optional build deps not available in Fedora %pom_disable_module httpclient-osgi From 8a9732757f91625ad5a6e30fcfdec6f88d982bce Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 29 Jul 2019 12:34:19 +0200 Subject: [PATCH 15/21] Update to upstream version 4.5.9 --- .gitignore | 1 + httpcomponents-client.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 64d05bf..2fd1f38 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.5.6-src.tar.gz /httpcomponents-client-4.5.7-src.tar.gz /httpcomponents-client-4.5.8-src.tar.gz +/httpcomponents-client-4.5.9-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index bb6409f..32cf893 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.5.8 -Release: 2%{?dist} +Version: 4.5.9 +Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -127,6 +127,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc README.txt RELEASE_NOTES.txt %changelog +* Mon Jul 29 2019 Marian Koncek - 4.5.9-1 +- Update to upstream version 4.5.9 + * Fri May 24 2019 Mikolaj Izdebski - 4.5.8-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 55fdc20..a9cf313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpcomponents-client-4.5.8-src.tar.gz) = 0730de98696dd97b669a157a1fdfb74a56d21d9dc04266ffe80e06a02cf5463ac85130262dc91fcc27ac6672ba38c51f6f5379e4667959254377d2cb8b6ddd19 +SHA512 (httpcomponents-client-4.5.9-src.tar.gz) = 587d5d4cd5a21e3d8b5e6214fe8b8288efeecd5fc5a055ac53d5f9f62c276dfb76e4a333952d34e5eccab73139f2b7d9b2b1805e6d07c2e4807152c962423d17 From a5a225f50cbe120f30f34f01c6d7bf979a4fa413 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 16 Sep 2019 13:09:00 +0200 Subject: [PATCH 16/21] Update to upstream version 4.5.10 --- .gitignore | 1 + httpcomponents-client.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2fd1f38..bd21843 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.5.7-src.tar.gz /httpcomponents-client-4.5.8-src.tar.gz /httpcomponents-client-4.5.9-src.tar.gz +/httpcomponents-client-4.5.10-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 32cf893..20a7ba4 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,6 +1,6 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.5.9 +Version: 4.5.10 Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ @@ -15,10 +15,9 @@ BuildRequires: %{?module_prefix}mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.httpcomponents:httpcomponents-parent:pom:) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) -BuildRequires: mvn(org.apache.httpcomponents:project:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.mockito:mockito-core) %if 0%{?module_prefix:1} @@ -127,6 +126,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc README.txt RELEASE_NOTES.txt %changelog +* Mon Sep 16 2019 Marian Koncek - 4.5.10-1 +- Update to upstream version 4.5.10 + * Mon Jul 29 2019 Marian Koncek - 4.5.9-1 - Update to upstream version 4.5.9 diff --git a/sources b/sources index a9cf313..a5c5640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpcomponents-client-4.5.9-src.tar.gz) = 587d5d4cd5a21e3d8b5e6214fe8b8288efeecd5fc5a055ac53d5f9f62c276dfb76e4a333952d34e5eccab73139f2b7d9b2b1805e6d07c2e4807152c962423d17 +SHA512 (httpcomponents-client-4.5.10-src.tar.gz) = 9bd1290d5947a5d84b24f18c5c138cdbb0a305a119536c3f1c35befcac6e3c4c8156b972dbe0f28169b6dbfcd0a97580b8721d5e25fad9deb12ba5a6cc74b710 From 48ebbe047724c1e04dd79c3ac8ba92ed386e8faf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 17/21] Mass rebuild for javapackages-tools 201902 --- httpcomponents-client.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 20a7ba4..e19fb08 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.5.10 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -126,6 +126,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc README.txt RELEASE_NOTES.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.5.10-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Sep 16 2019 Marian Koncek - 4.5.10-1 - Update to upstream version 4.5.10 From a8a2ee70c2b955589da43343fe5ac43a45c0f528 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 22 Jan 2020 13:26:39 +0100 Subject: [PATCH 18/21] Update to upstream version 4.5.11 --- .gitignore | 1 + httpcomponents-client.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bd21843..daf3251 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.5.8-src.tar.gz /httpcomponents-client-4.5.9-src.tar.gz /httpcomponents-client-4.5.10-src.tar.gz +/httpcomponents-client-4.5.11-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index e19fb08..21b04d2 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,10 +1,10 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.5.10 -Release: 2%{?dist} +Version: 4.5.11 +Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ -Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz +Source0: https://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz BuildArch: noarch Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch @@ -126,6 +126,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc README.txt RELEASE_NOTES.txt %changelog +* Wed Jan 22 2020 Marian Koncek - 4.5.11-1 +- Update to upstream version 4.5.11 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.5.10-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index a5c5640..6aa3297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpcomponents-client-4.5.10-src.tar.gz) = 9bd1290d5947a5d84b24f18c5c138cdbb0a305a119536c3f1c35befcac6e3c4c8156b972dbe0f28169b6dbfcd0a97580b8721d5e25fad9deb12ba5a6cc74b710 +SHA512 (httpcomponents-client-4.5.11-src.tar.gz) = e2f005a7866ac0cb6d8d7c1b0d9d516cd28f6f175722a48d3ec86e63d5af6ff9df633aee1e736453ea4360a12abfbdc7e1cf9e9b8b3fac5229ffcad3eebe376f From 0acbf4930edae19fa4a2ca7264fe2a8256145390 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 19/21] Build with OpenJDK 8 --- httpcomponents-client.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 21b04d2..70e4e50 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.5.11 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: https://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -10,7 +10,7 @@ BuildArch: noarch Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch1: 0002-Port-to-mockito-2.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: %{?module_prefix}mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -126,6 +126,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc README.txt RELEASE_NOTES.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 4.5.11-2 +- Build with OpenJDK 8 + * Wed Jan 22 2020 Marian Koncek - 4.5.11-1 - Update to upstream version 4.5.11 From 234ec4ce5a0dbc7b32d7f7f80c3d3318cc09b002 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 20/21] Conditionalize buildrequires in bootstrap mode --- httpcomponents-client.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 70e4e50..14559fa 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.5.11 @@ -11,6 +13,9 @@ Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch1: 0002-Port-to-mockito-2.patch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: %{?module_prefix}mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) @@ -19,13 +24,16 @@ BuildRequires: mvn(org.apache.httpcomponents:httpcomponents-parent:pom:) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.mockito:mockito-core) +%endif %if 0%{?module_prefix:1} %package -n %{module_prefix}%{name} Summary: %{summary} %endif +%if %{without bootstrap} BuildRequires: publicsuffix-list +%endif Requires: publicsuffix-list %if 0%{?module_prefix:1} From 6b3dc34380b28cfd24ff087a1d963849b1657112 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 21/21] Turn off bootstrap mode by default --- httpcomponents-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 14559fa..5d79dc7 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore