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

Fix build with jdk9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=4
This commit is contained in:
Fridrich Strba 2017-10-09 06:47:42 +00:00 committed by Git OBS Bridge
parent 76883422d2
commit 1dc68a5167
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache-commons-lang3.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 9 06:45:42 UTC 2017 - fstrba@suse.com
- Modified patch:
* commons-lang3-3.4-javadoc.patch
+ Fix build with jdk9
- Allow building with jdk9 too
- Run fdupes on javadoc
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 12:45:49 UTC 2017 - fstrba@suse.com Thu Sep 14 12:45:49 UTC 2017 - fstrba@suse.com

7
apache-commons-lang3.spec
View File

@ -24,18 +24,18 @@ Release: 0
Summary: Apache Commons Lang Package Summary: Apache Commons Lang Package
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: commons-lang3-3.4-javadoc.patch Patch0: commons-lang3-3.4-javadoc.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: java-devel >= 1.6.0 BuildRequires: fdupes
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
BuildConflicts: java-devel >= 1.9
%description %description
The standard Java libraries fail to provide enough methods for The standard Java libraries fail to provide enough methods for
@ -83,6 +83,7 @@ cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc # javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}/%{name}/
%files %files
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt

7
commons-lang3-3.4-javadoc.patch
View File

@ -1,9 +1,10 @@
--- commons-lang3-3.4-src/build.xml 2015-04-03 14:28:37.000000000 +0200 --- 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 +++ commons-lang3-3.4-src/build.xml 2017-10-09 08:38:44.281345802 +0200
@@ -124,8 +124,6 @@ @@ -123,9 +123,6 @@
use="true"
encoding="${compile.encoding}" encoding="${compile.encoding}"
source="${compile.source}"> source="${compile.source}">
<classpath refid="compile.classpath"/> - <classpath refid="compile.classpath"/>
- <link href="${jdk.javadoc}"/> - <link href="${jdk.javadoc}"/>
- <link href="${collections.javadoc}"/> - <link href="${collections.javadoc}"/>
</javadoc> </javadoc>