From f25f3405992a785dfe6d59bcbab507319cb0d1dc1b03c6f1bb883eff68aa5066 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Sep 2017 07:33:11 +0000 Subject: [PATCH] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=31 --- xmlgraphics-commons.changes | 7 ++++++- xmlgraphics-commons.spec | 9 ++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes index fab1182..2953b6d 100644 --- a/xmlgraphics-commons.changes +++ b/xmlgraphics-commons.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 19 07:32:15 UTC 2017 - fstrba@suse.com + +- Fix build with jdk9: specify java source and target level 1.6 + ------------------------------------------------------------------- Fri May 19 11:03:58 UTC 2017 - vsistek@suse.com -- Add BuildRequires: javapackages-local (for maven conversions) +- Add BuildRequires: javapackages-local (for maven conversions) ------------------------------------------------------------------- Mon Mar 20 15:20:21 UTC 2017 - sknorr@suse.com diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 5827110..6dbcec6 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -30,6 +30,7 @@ BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit BuildRequires: apache-commons-io >= 1.1 BuildRequires: apache-commons-logging +BuildRequires: fdupes BuildRequires: gpg2 # Needed for maven conversions BuildRequires: javapackages-local @@ -54,8 +55,7 @@ Summary: Javadoc for %{name} Group: Documentation/HTML %description javadoc - -%{summary}. +Javadoc for package %{name}. %prep %setup -q %{name}-%{version} @@ -69,7 +69,7 @@ pushd lib ln -sf $(build-classpath commons-io) . ln -sf $(build-classpath commons-logging) . popd -ant package javadocs maven-artifacts +ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs maven-artifacts %install install -Dpm 644 build/%{name}-%{version}.jar \ @@ -83,11 +83,11 @@ install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # install -dm 755 %{buildroot}%{_docdir}/%{name} %files -%defattr(0644,root,root,0755) %doc LICENSE %{_javadir}/%{name}.jar %{_mavenpomdir}/* @@ -98,7 +98,6 @@ install -dm 755 %{buildroot}%{_docdir}/%{name} %endif %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog