Sync from SUSE:SLFO:Main apache-commons-httpclient revision 3d9c9f387b2ff7599f2c3dfd2a9dfee0
This commit is contained in:
parent
ead77d044f
commit
0980faaa26
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 30 11:15:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Clean the spec: remove old macros and change to working urls
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 10:19:53 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 27 10:39:27 UTC 2020 - Pedro Monreal <pmonreal@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache-commons-httpclient
|
||||
#
|
||||
# Copyright (c) 2020 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
|
||||
@ -23,9 +23,9 @@ Release: 0
|
||||
Summary: Feature rich package for accessing resources via HTTP
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://hc.apache.org/httpclient-3.x/
|
||||
Source0: http://www.apache.org/dist/httpcomponents/commons-httpclient/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: http://repo.maven.apache.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
|
||||
URL: https://hc.apache.org/httpclient-3.x/
|
||||
Source0: https://archive.apache.org/dist/httpcomponents/%{short_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: https://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
|
||||
Patch0: %{name}-disablecryptotests.patch
|
||||
# Add OSGi MANIFEST.MF bits
|
||||
Patch1: %{name}-addosgimanifest.patch
|
||||
@ -43,10 +43,8 @@ BuildRequires: commons-codec
|
||||
BuildRequires: commons-logging >= 1.0.3
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: junit
|
||||
Requires: commons-codec
|
||||
Requires: commons-logging >= 1.0.3
|
||||
Provides: %{short_name} = %{version}
|
||||
Provides: jakarta-%{short_name} = %{version}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}
|
||||
@ -103,17 +101,17 @@ Manual for %{name}
|
||||
mkdir lib # duh
|
||||
rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
|
||||
|
||||
%patch0
|
||||
%patch -P 0
|
||||
|
||||
pushd src/conf
|
||||
sed -i 's/\r//' MANIFEST.MF
|
||||
%patch1
|
||||
%patch -P 1
|
||||
popd
|
||||
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch -P 2
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
|
||||
# Use javax classes, not com.sun ones
|
||||
# assume no filename contains spaces
|
||||
@ -155,17 +153,17 @@ ln -s %{name}.jar jakarta-%{short_name}3.jar
|
||||
popd
|
||||
|
||||
# pom
|
||||
mkdir -p %{buildroot}%{_mavenpomdir}
|
||||
cp -p %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
install -d -m 0755 %{buildroot}%{_mavenpomdir}
|
||||
%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar -a apache:commons-httpclient
|
||||
|
||||
# javadoc
|
||||
mkdir -p %{buildroot}%{_javadocdir}
|
||||
install -d -m 0755 %{buildroot}%{_javadocdir}
|
||||
mv dist/docs/api %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
# demo
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr src/examples src/contrib %{buildroot}%{_datadir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
@ -174,22 +172,15 @@ rm -f dist/docs/{BUILDING,TESTING}.txt
|
||||
ln -s %{_javadocdir}/%{name} dist/docs/apidocs
|
||||
%fdupes -s dist/docs
|
||||
|
||||
%files
|
||||
%files -f .mfiles
|
||||
%defattr(0644,root,root,0755)
|
||||
%license LICENSE.txt
|
||||
%doc README.txt RELEASE_NOTES.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{name}3.jar
|
||||
%{_javadir}/%{short_name}3.jar
|
||||
%{_javadir}/%{short_name}.jar
|
||||
%{_javadir}/jakarta-%{short_name}3.jar
|
||||
%{_javadir}/jakarta-%{short_name}.jar
|
||||
%{_mavenpomdir}/*
|
||||
%if %{defined _maven_repository}
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%else
|
||||
%{_datadir}/maven-metadata/%{name}.xml*
|
||||
%endif
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
|
Loading…
Reference in New Issue
Block a user