Fix build with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=58
This commit is contained in:
parent
a3b0117589
commit
22c3275d75
@ -57,6 +57,7 @@ BuildRequires: unzip
|
|||||||
BuildRequires: xml-commons-jaxp-1.3-apis
|
BuildRequires: xml-commons-jaxp-1.3-apis
|
||||||
BuildRequires: xmlgraphics-batik >= 1.8
|
BuildRequires: xmlgraphics-batik >= 1.8
|
||||||
BuildRequires: xmlgraphics-commons >= 2.1
|
BuildRequires: xmlgraphics-commons >= 2.1
|
||||||
|
#!BuildIgnore: saxon
|
||||||
Requires: apache-commons-io >= 2.4
|
Requires: apache-commons-io >= 2.4
|
||||||
Requires: apache-commons-logging
|
Requires: apache-commons-logging
|
||||||
Requires: apache-pdfbox
|
Requires: apache-pdfbox
|
||||||
@ -65,11 +66,9 @@ Requires: java >= 1.6.0
|
|||||||
Requires: xml-commons-jaxp-1.3-apis
|
Requires: xml-commons-jaxp-1.3-apis
|
||||||
Requires: xmlgraphics-batik >= 1.8
|
Requires: xmlgraphics-batik >= 1.8
|
||||||
Requires: xmlgraphics-commons >= 2.1
|
Requires: xmlgraphics-commons >= 2.1
|
||||||
#!BuildIgnore: saxon
|
|
||||||
Provides: %{bname} = %{version}-%{release}
|
Provides: %{bname} = %{version}-%{release}
|
||||||
Obsoletes: %{bname} < %{version}-%{release}
|
Obsoletes: %{bname} < %{version}-%{release}
|
||||||
Provides: fo-formatter = %{version}-%{release}
|
Provides: fo-formatter = %{version}-%{release}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -83,6 +82,9 @@ representation), Print, AWT, MIF, and TXT.
|
|||||||
%setup -q -n %{bname}-%{version} -a5
|
%setup -q -n %{bname}-%{version} -a5
|
||||||
ln -thyph offo-hyphenation/hyph/*.xml
|
ln -thyph offo-hyphenation/hyph/*.xml
|
||||||
find -name "*.jar" | xargs -t rm
|
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
|
%patch1 -p1 -b .cli
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
@ -121,7 +123,9 @@ ln -s $(build-classpath xmlgraphics-commons)
|
|||||||
ln -s $(build-classpath qdox)
|
ln -s $(build-classpath qdox)
|
||||||
popd
|
popd
|
||||||
export CLASSPATH= LANG=en_US.UTF-8
|
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
|
# Build the manpage(s) and HTML
|
||||||
DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current
|
DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current
|
||||||
@ -173,7 +177,6 @@ done
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc NOTICE LICENSE README known-issues.xml
|
%doc NOTICE LICENSE README known-issues.xml
|
||||||
%doc *.html
|
%doc *.html
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user