Accepting request 526166 from Java:packages
Fix build of javadoc OBS-URL: https://build.opensuse.org/request/show/526166 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-pool2?expand=0&rev=2
This commit is contained in:
commit
897d1163a0
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user