diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes index 8b44f2b..0680650 100644 --- a/apache-commons-lang3.changes +++ b/apache-commons-lang3.changes @@ -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 diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 969eb07..25b934a 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -24,18 +24,18 @@ Release: 0 Summary: Apache Commons Lang Package License: Apache-2.0 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 Patch0: commons-lang3-3.4-javadoc.patch BuildRequires: ant BuildRequires: ant-junit -BuildRequires: java-devel >= 1.6.0 +BuildRequires: fdupes +BuildRequires: java-devel >= 1.6 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 @@ -83,6 +83,7 @@ cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir}/%{name}/ %files %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt diff --git a/commons-lang3-3.4-javadoc.patch b/commons-lang3-3.4-javadoc.patch index 5f8d472..7a481f4 100644 --- a/commons-lang3-3.4-javadoc.patch +++ b/commons-lang3-3.4-javadoc.patch @@ -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 2017-09-14 14:21:42.537312381 +0200 -@@ -124,8 +124,6 @@ ++++ commons-lang3-3.4-src/build.xml 2017-10-09 08:38:44.281345802 +0200 +@@ -123,9 +123,6 @@ + use="true" encoding="${compile.encoding}" source="${compile.source}"> - +- - -