Fridrich Strba 2017-09-14 14:56:39 +00:00 committed by Git OBS Bridge
parent 7ae230f4c5
commit 9f425edf13
2 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 14 14:55:25 UTC 2017 - fstrba@suse.com
- Fix javadoc build
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 29 11:24:32 UTC 2016 - tchvatal@suse.com Thu Sep 29 11:24:32 UTC 2016 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool2 # spec file for package apache-commons-pool2
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 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
@ -35,7 +35,6 @@ BuildRequires: junit
Requires: cglib Requires: cglib
Provides: %{short_name} = %{version} Provides: %{short_name} = %{version}
Obsoletes: %{short_name} < %{version} Obsoletes: %{short_name} < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
@ -65,7 +64,7 @@ find . -name "*.jar" -exec rm -f {} \;
%patch0 %patch0
%build %build
export CLASSPATH=$(build-classpath cglib) echo "cglib.jar=$(build-classpath cglib)" >> build.properties
ant -Djava.io.tmpdir=. clean dist ant -Djava.io.tmpdir=. clean dist
%install %install
@ -79,7 +78,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files %files
%defattr(0644,root,root,0755)
%doc README.txt LICENSE.txt %doc README.txt LICENSE.txt
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-%{version}.jar
@ -87,7 +85,6 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%{_javadir}/%{short_name}-%{version}.jar %{_javadir}/%{short_name}-%{version}.jar
%files javadoc %files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%changelog %changelog