rpm/apache-commons-httpclient
SHA256
1
0
Fork 0
forked from pool/apache-commons-httpclient
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-httpclient?expand=0&rev=17

Browse Source
This commit is contained in:
Fridrich Strba 2018-05-15 10:35:21 +00:00 committed by Git OBS Bridge
parent 436f1b6cb3
commit bb198dfeeb
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache-commons-httpclient.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 15 10:34:34 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
- Run fdupes on documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 7 11:49:25 UTC 2017 - fstrba@suse.com Thu Sep 7 11:49:25 UTC 2017 - fstrba@suse.com

14
apache-commons-httpclient.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-httpclient # spec file for package apache-commons-httpclient
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -36,15 +36,16 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: commons-codec BuildRequires: commons-codec
BuildRequires: commons-logging >= 1.0.3 BuildRequires: commons-logging >= 1.0.3
BuildRequires: java-devel >= 1.6.0 BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: junit BuildRequires: junit
Requires: commons-codec Requires: commons-codec
Requires: commons-logging >= 1.0.3 Requires: commons-logging >= 1.0.3
Provides: %{short_name} = %{version} Provides: %{short_name} = %{version}
Provides: jakarta-%{short_name} = %{version} Provides: jakarta-%{short_name} = %{version}
Obsoletes: jakarta-%{short_name} <= 3.1 Obsoletes: jakarta-%{short_name} < %{version}
Provides: jakarta-%{short_name}3 = %{version} Provides: jakarta-%{short_name}3 = %{version}
Obsoletes: jakarta-%{short_name}3 <= 3.1 Obsoletes: jakarta-%{short_name}3 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -125,7 +126,7 @@ sed -i 's/\r//' LICENSE.txt
%build %build
ant \ ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-Dbuild.sysclasspath=first \ -Dbuild.sysclasspath=first \
-Djavadoc.j2sdk.link=%{_javadocdir}/java \ -Djavadoc.j2sdk.link=%{_javadocdir}/java \
-Djavadoc.logging.link=%{_javadocdir}/apache-commons-logging \ -Djavadoc.logging.link=%{_javadocdir}/apache-commons-logging \
@ -151,14 +152,17 @@ popd
# javadoc # javadoc
mkdir -p %{buildroot}%{_javadocdir} mkdir -p %{buildroot}%{_javadocdir}
mv dist/docs/api %{buildroot}%{_javadocdir}/%{name} mv dist/docs/api %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# demo # demo
mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_datadir}/%{name}
cp -pr src/examples src/contrib %{buildroot}%{_datadir}/%{name} cp -pr src/examples src/contrib %{buildroot}%{_datadir}/%{name}
%fdupes -s %{buildroot}%{_datadir}/%{name}
# manual and docs # manual and docs
rm -f dist/docs/{BUILDING,TESTING}.txt rm -f dist/docs/{BUILDING,TESTING}.txt
ln -s %{_javadocdir}/%{name} dist/docs/apidocs ln -s %{_javadocdir}/%{name} dist/docs/apidocs
%fdupes -s dist/docs
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)