From 25c203d1df8638c61abbcff064bd300919fd73983faf124708e54c402b9df50c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:23:55 +0000 Subject: [PATCH 1/2] Accepting request 1114364 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114364 OBS-URL: https://build.opensuse.org/package/show/Java:packages/httpcomponents-client?expand=0&rev=11 --- httpcomponents-client.spec | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 124c835..d5999bc 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -33,12 +33,9 @@ BuildRequires: apache-commons-codec BuildRequires: apache-commons-logging BuildRequires: fdupes BuildRequires: httpcomponents-core -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: publicsuffix Requires: publicsuffix -Requires: mvn(commons-codec:commons-codec) -Requires: mvn(commons-logging:commons-logging) -Requires: mvn(org.apache.httpcomponents:httpcore) BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -166,15 +163,6 @@ rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/memcached rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %pom_remove_dep :ehcache-core httpclient-cache -for module in fluent-hc httpclient httpclient-cache httpmime; do - %pom_xpath_inject "pom:project" " - org.apache.httpcomponents - %{version}" $module - %pom_remove_parent $module - # adds version "any" if none is specified - %pom_change_dep ::::: ::::: $module -done - %build mkdir -p lib build-jar-repository -s lib httpcomponents/httpcore commons-logging commons-codec @@ -196,10 +184,10 @@ done # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents for module in fluent-hc httpclient httpmime; do - install -pm 0644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/${module}.pom + %{mvn_install_pom} ${module}/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/${module}.pom %add_maven_depmap httpcomponents/${module}.pom httpcomponents/${module}.jar done -install -pm 0644 httpclient-cache/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/httpclient-cache.pom +%{mvn_install_pom} httpclient-cache/pom.xml %{buildroot}%{_mavenpomdir}/httpcomponents/httpclient-cache.pom %add_maven_depmap httpcomponents/httpclient-cache.pom httpcomponents/httpclient-cache.jar -f cache # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} From e31fd9fda45c2f3e9343797d473c2805c9076264e1c703db3b16ccfe279060b2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:35:53 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/httpcomponents-client?expand=0&rev=12 --- httpcomponents-client.changes | 5 +++++ httpcomponents-client.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/httpcomponents-client.changes b/httpcomponents-client.changes index f83da8d..43561d7 100644 --- a/httpcomponents-client.changes +++ b/httpcomponents-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:35:47 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sat Mar 19 07:28:15 UTC 2022 - Fridrich Strba diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index d5999bc..a09505c 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ # # spec file for package httpcomponents-client # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,8 +71,8 @@ Group: Documentation/HTML %prep %setup -q -a1 -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 # Remove optional build deps not available in openSUSE %pom_disable_module httpclient-osgi