diff --git a/apache-commons-pool2.changes b/apache-commons-pool2.changes index 4bb8a48..c5e90b3 100644 --- a/apache-commons-pool2.changes +++ b/apache-commons-pool2.changes @@ -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 diff --git a/apache-commons-pool2.spec b/apache-commons-pool2.spec index 3297b0d..4e14b3c 100644 --- a/apache-commons-pool2.spec +++ b/apache-commons-pool2.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,6 @@ BuildRequires: junit Requires: cglib Provides: %{short_name} = %{version} Obsoletes: %{short_name} < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -65,7 +64,7 @@ find . -name "*.jar" -exec rm -f {} \; %patch0 %build -export CLASSPATH=$(build-classpath cglib) +echo "cglib.jar=$(build-classpath cglib)" >> build.properties ant -Djava.io.tmpdir=. clean dist %install @@ -79,7 +78,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc README.txt LICENSE.txt %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar @@ -87,7 +85,6 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %{_javadir}/%{short_name}-%{version}.jar %files javadoc -%defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name} %changelog