This commit is contained in:
parent
41bf775a7d
commit
76883422d2
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 12:45:49 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Specify java target and source level 1.6
|
||||
- Force building with jdk < 1.9, since jdk9's javadoc chocks on one
|
||||
class file (internal error)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 09:59:33 UTC 2017 - pcervinka@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache-commons-lang3
|
||||
#
|
||||
# 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
|
||||
@ -26,15 +26,16 @@ License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://commons.apache.org/%{base_name}
|
||||
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Patch0: commons-lang3-3.4-javadoc.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: java-javadoc >= 1.6.0
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: junit
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
BuildConflicts: java-devel >= 1.9
|
||||
|
||||
%description
|
||||
The standard Java libraries fail to provide enough methods for
|
||||
@ -58,16 +59,16 @@ Javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
%patch0 -p1
|
||||
sed -i 's/\r//' *.txt
|
||||
|
||||
%build
|
||||
export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
|
||||
export CLASSPATH=
|
||||
ant \
|
||||
-Dcompile.source=1.7 -Dcompile.target=1.7 \
|
||||
-Dcompile.source=1.6 -Dcompile.target=1.6 \
|
||||
-Dfinal.name=%{short_name} \
|
||||
-Djdk.javadoc=%{_javadocdir}/java \
|
||||
dist
|
||||
jar javadoc
|
||||
|
||||
%install
|
||||
# jars
|
||||
@ -84,7 +85,6 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{short_name}.jar
|
||||
@ -92,7 +92,6 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
%{_datadir}/maven-metadata/%{name}.xml
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
11
commons-lang3-3.4-javadoc.patch
Normal file
11
commons-lang3-3.4-javadoc.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- commons-lang3-3.4-src/build.xml 2015-04-03 14:28:37.000000000 +0200
|
||||
+++ commons-lang3-3.4-src/build.xml 2017-09-14 14:21:42.537312381 +0200
|
||||
@@ -124,8 +124,6 @@
|
||||
encoding="${compile.encoding}"
|
||||
source="${compile.source}">
|
||||
<classpath refid="compile.classpath"/>
|
||||
- <link href="${jdk.javadoc}"/>
|
||||
- <link href="${collections.javadoc}"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
Loading…
Reference in New Issue
Block a user