diff --git a/jsr-305-ri-build.xml b/jsr-305-ri-build.xml index b85c475..92267d0 100644 --- a/jsr-305-ri-build.xml +++ b/jsr-305-ri-build.xml @@ -2,7 +2,7 @@ - + diff --git a/jsr-305.changes b/jsr-305.changes index ffa9fec..5387a30 100644 --- a/jsr-305.changes +++ b/jsr-305.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 19 09:49:18 UTC 2017 - fstrba@suse.com + +- Fix build with jdk9: specify java target and source 1.6 + ------------------------------------------------------------------- Fri May 19 10:53:24 UTC 2017 - dziolkowski@suse.com diff --git a/jsr-305.spec b/jsr-305.spec index e29f9f1..bdc33fb 100644 --- a/jsr-305.spec +++ b/jsr-305.spec @@ -32,6 +32,7 @@ Source1: jsr-305-ri-build.xml # The URL reffers to New BSD License - used == Bill Pugh, == 2008 Source2: license BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -64,7 +65,7 @@ cp %{SOURCE2} . export OPT_JAR_LIST=: export CLASSPATH= pushd ri -%{ant} -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dversion=%{version} -Djava.javadoc=%{_javadocdir}/java popd @@ -82,6 +83,7 @@ cp -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755)