Accepting request 631993 from Java:packages

- Fix building with ant >= 1.9.12

OBS-URL: https://build.opensuse.org/request/show/631993
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2018-09-03 08:33:24 +00:00 committed by Git OBS Bridge
commit 039c022531
2 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 28 13:51:49 UTC 2018 - tchvatal@suse.com
- Fix building with ant >= 1.9.12
-------------------------------------------------------------------
Thu Apr 5 10:13:02 UTC 2018 - fstrba@suse.com

View File

@ -24,14 +24,14 @@ Release: 0
Summary: Formatter for Printing XSLT Processed XML Files
License: Apache-2.0
Group: Productivity/Publishing/XML
Url: http://xmlgraphics.apache.org/fop/
Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-2.1-src.tar.gz
URL: https://xmlgraphics.apache.org/fop/
Source0: https://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-%{version}-src.tar.gz
#FIX-OPENSUSE: add xmlgraphics-commons to classpath
Source1: %{name}.script
Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_1/xmlgraphics-fop-pom-template.pom
Source2: https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_1/xmlgraphics-fop-pom-template.pom
Source3: %{name}-fontmetrics.script
Source4: %{name}-fontlist.script
Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
Source5: https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
# Manpage(s)
Source10: %{name}.xml
Source11: %{name}-fontmetrics.xml
@ -46,7 +46,6 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-pdfbox
BuildRequires: avalon-framework
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gpg2
BuildRequires: java-devel-openjdk >= 1.8.0.121
# Needed for maven conversions
BuildRequires: javapackages-local
@ -127,7 +126,7 @@ popd
export CLASSPATH= LANG=en_US.UTF-8
ant \
-Djavac.source=1.6 -Djavac.target=1.6 \
package maven-artifacts
package
# Build the manpage(s) and HTML
DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current
@ -145,7 +144,7 @@ install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# script
@ -179,7 +178,8 @@ done
popd
%files
%doc NOTICE LICENSE README known-issues.xml
%license LICENSE
%doc NOTICE README known-issues.xml
%doc *.html
%attr(0755,root,root) %{_bindir}/%{name}