From b4b029deb4ee888c68b6a79d436adba40321cff2847feb02a9a272c2ff7e3778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 28 Aug 2018 13:56:46 +0000 Subject: [PATCH] - Fix building with ant >= 1.9.12 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=69 --- xmlgraphics-fop.changes | 5 +++++ xmlgraphics-fop.spec | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 8849c0e..4902029 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -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 diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index 85fc2ad..de9dc52 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -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}