From d495e8c06cc2b237738aefdc47fa66af0ad584fe7ec39bf37e40b738abe0040b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 14:37:45 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main httpcomponents-core revision
 525b41fb39ec53bac4d6ccbb54a2d590

---
 httpcomponents-core.changes |  5 +++++
 httpcomponents-core.spec    | 21 ++++-----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/httpcomponents-core.changes b/httpcomponents-core.changes
index 637ccb8..d8ac6c2 100644
--- a/httpcomponents-core.changes
+++ b/httpcomponents-core.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:37:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Sat Mar 19 07:24:19 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 36e94f0..937e33a 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package httpcomponents-core
 #
-# 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
@@ -29,7 +29,7 @@ Source1:        %{name}-build.tar.xz
 Patch0:         %{name}-java8compat.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -65,7 +65,7 @@ Group:          Development/Libraries/Java
 %prep
 %setup -q -a1
 
-%patch0 -p1
+%patch -P 0 -p1
 
 # Random test failures on ARM -- 100 ms sleep is not eneough on this
 # very performant arch, lets make it 2 s
@@ -101,19 +101,6 @@ for module in httpcore httpcore-nio; do
         </plugin>" $module
 done
 
-for module in httpcore httpcore-nio; do
-    %pom_xpath_inject "pom:project" "
-	  <groupId>org.apache.httpcomponents</groupId>
-	  <version>%{version}</version>" $module
-	%pom_remove_parent $module
-	# adds version "any" if none is specified
-	%pom_change_dep ::::: ::::: $module
-done
-
-# install JARs to httpcomponents/ for compatibility reasons
-# several other packages expect to find the JARs there
-%{mvn_file} ":{*}" httpcomponents/@1
-
 %build
 mkdir -p lib
 %if %{with tests}
@@ -134,7 +121,7 @@ done
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents
 for module in httpcore httpcore-nio; 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
 # javadoc