Sync from SUSE:SLFO:Main httpcomponents-core revision 525b41fb39ec53bac4d6ccbb54a2d590

This commit is contained in:
Adrian Schröter 2024-05-31 14:37:45 +02:00
parent abb9dc2542
commit d495e8c06c
2 changed files with 9 additions and 17 deletions

View File

@ -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> Sat Mar 19 07:24:19 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package httpcomponents-core # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,7 @@ Source1: %{name}-build.tar.xz
Patch0: %{name}-java8compat.patch Patch0: %{name}-java8compat.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
@ -65,7 +65,7 @@ Group: Development/Libraries/Java
%prep %prep
%setup -q -a1 %setup -q -a1
%patch0 -p1 %patch -P 0 -p1
# Random test failures on ARM -- 100 ms sleep is not eneough on this # Random test failures on ARM -- 100 ms sleep is not eneough on this
# very performant arch, lets make it 2 s # very performant arch, lets make it 2 s
@ -101,19 +101,6 @@ for module in httpcore httpcore-nio; do
</plugin>" $module </plugin>" $module
done 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 %build
mkdir -p lib mkdir -p lib
%if %{with tests} %if %{with tests}
@ -134,7 +121,7 @@ done
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents install -dm 0755 %{buildroot}%{_mavenpomdir}/httpcomponents
for module in httpcore httpcore-nio; do 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 %add_maven_depmap httpcomponents/${module}.pom httpcomponents/${module}.jar
done done
# javadoc # javadoc