From 22c3275d75e0b33643ccb94bc0c9aebfc879fb0fc445d80eb48e25bd057c13d5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Sep 2017 07:14:09 +0000 Subject: [PATCH] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=58 --- xmlgraphics-fop.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index 90ffd12..2fe5082 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -57,6 +57,7 @@ BuildRequires: unzip BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xmlgraphics-batik >= 1.8 BuildRequires: xmlgraphics-commons >= 2.1 +#!BuildIgnore: saxon Requires: apache-commons-io >= 2.4 Requires: apache-commons-logging Requires: apache-pdfbox @@ -65,11 +66,9 @@ Requires: java >= 1.6.0 Requires: xml-commons-jaxp-1.3-apis Requires: xmlgraphics-batik >= 1.8 Requires: xmlgraphics-commons >= 2.1 -#!BuildIgnore: saxon Provides: %{bname} = %{version}-%{release} Obsoletes: %{bname} < %{version}-%{release} Provides: fo-formatter = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -83,6 +82,9 @@ representation), Print, AWT, MIF, and TXT. %setup -q -n %{bname}-%{version} -a5 ln -thyph offo-hyphenation/hyph/*.xml find -name "*.jar" | xargs -t rm +# Remove this file. It needs jai and we don't compile it. +# Just javadoc chokes on it. +rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java %patch1 -p1 -b .cli %patch2 -p1 %patch3 -p1 @@ -121,7 +123,9 @@ ln -s $(build-classpath xmlgraphics-commons) ln -s $(build-classpath qdox) popd export CLASSPATH= LANG=en_US.UTF-8 -ant package maven-artifacts +ant \ + -Djavac.source=1.6 -Djavac.target=1.6 \ + package maven-artifacts # Build the manpage(s) and HTML DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current @@ -173,7 +177,6 @@ done popd %files -%defattr(0644,root,root,0755) %doc NOTICE LICENSE README known-issues.xml %doc *.html