From 74552ea2c9fbccdbdbd7d9c29278ceb2be66c7979160e2fa74244478ed8a8a70 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 May 2020 14:44:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=92 --- ...aphics-fop-pom-template.pom => fop-2.1.pom | 2 +- xmlgraphics-fop.changes | 9 ++++++++ xmlgraphics-fop.script | 2 +- xmlgraphics-fop.spec | 21 ++++++++----------- 4 files changed, 20 insertions(+), 14 deletions(-) rename xmlgraphics-fop-pom-template.pom => fop-2.1.pom (97%) diff --git a/xmlgraphics-fop-pom-template.pom b/fop-2.1.pom similarity index 97% rename from xmlgraphics-fop-pom-template.pom rename to fop-2.1.pom index 381e368..4a7ee6f 100644 --- a/xmlgraphics-fop-pom-template.pom +++ b/fop-2.1.pom @@ -25,7 +25,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> fop jar Apache FOP - @version@ + 2.1 http://xmlgraphics.apache.org/fop/ Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF. 1999 diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 072407e..3db0d13 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 18 14:41:12 UTC 2020 - Fridrich Strba + +- Do not install the OFFO hyphenation files to datadir, but package + instead the xmlgraphics-fop-hyph.jar and + xmlgraphics-fop-sandbox.jar that we build anyway. This fixes + boo#1145693 +- Clean up the build a bit + ------------------------------------------------------------------- Fri Apr 3 10:50:59 UTC 2020 - Fridrich Strba diff --git a/xmlgraphics-fop.script b/xmlgraphics-fop.script index ea50056..f885a75 100644 --- a/xmlgraphics-fop.script +++ b/xmlgraphics-fop.script @@ -33,7 +33,7 @@ fi # Rest of the configuration MAIN_CLASS=org.apache.fop.cli.Main -BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io avalon-framework-api avalon-framework-impl batik-all fontbox xml-commons-apis xml-commons-apis-ext" +BASE_JARS="xmlgraphics-fop xmlgraphics-fop-hyph xmlgraphics-commons commons-logging commons-io avalon-framework-api avalon-framework-impl batik-all fontbox xml-commons-apis xml-commons-apis-ext" # Set parameters set_jvm diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index 36eaecf..8453335 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -26,9 +26,9 @@ License: Apache-2.0 Group: Productivity/Publishing/XML URL: https://xmlgraphics.apache.org/fop/ Source0: https://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-%{version}-src.tar.gz +Source1: https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/fop/%{version}/fop-%{version}.pom #FIX-OPENSUSE: add xmlgraphics-commons to classpath -Source1: %{name}.script -Source2: https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_1/xmlgraphics-fop-pom-template.pom +Source2: %{name}.script Source3: %{name}-fontmetrics.script Source4: %{name}-fontlist.script Source5: https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip @@ -67,8 +67,8 @@ Requires: commons-io >= 2.4 Requires: commons-logging Requires: java >= 1.8 Requires: xml-commons-apis >= 1.3 -Requires: xmlgraphics-batik >= 1.8 Requires: xmlgraphics-commons >= 2.1 +%requires_ge xmlgraphics-batik Provides: %{bname} = %{version}-%{release} Obsoletes: %{bname} < %{version}-%{release} Provides: fo-formatter = %{version}-%{release} @@ -99,12 +99,10 @@ rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java %patch7 -p1 %endif -cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do sed -i "s=@VERSION@=%{version}=" $x done -sed -i "s=@version@=%{version}=" xmlgraphics-fop-pom-template.pom %build build-jar-repository -s lib \ @@ -138,15 +136,17 @@ done # jars mkdir -p %{buildroot}%{_javadir} install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 644 build/%{bname}-hyph.jar %{buildroot}%{_javadir}/%{name}-hyph.jar +install -m 644 build/%{bname}-sandbox.jar %{buildroot}%{_javadir}/%{name}-sandbox.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 xmlgraphics-fop-pom-template.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # script mkdir -p %{buildroot}%{_bindir} -cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name} +cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name} cp -p %{SOURCE3} %{buildroot}%{_bindir}/%{name}-fontmetrics cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-fontlist # compat symlink @@ -155,9 +155,6 @@ ln -s %{name}-fontmetrics %{buildroot}%{_bindir}/%{bname}-fontmetrics ln -s %{name}-fontlist %{buildroot}%{_bindir}/%{bname}-fontlist # data -mkdir -p %{buildroot}%{_datadir}/%{name} -cp -pr hyph %{buildroot}%{_datadir}/%{name} -cp -pr conf %{buildroot}%{_datadir}/%{name} install -D -m 644 conf/fop.xconf %{buildroot}%{_sysconfdir}/fop.xconf # Manpages @@ -175,17 +172,17 @@ done popd %files -f .mfiles +%{_javadir}/%{name}-hyph.jar +%{_javadir}/%{name}-sandbox.jar %license LICENSE %doc NOTICE README known-issues.xml %doc *.html - %attr(0755,root,root) %{_bindir}/%{name} %{_bindir}/%{bname} %attr(0755,root,root) %{_bindir}/%{name}-fontmetrics %{_bindir}/%{bname}-fontmetrics %attr(0755,root,root) %{_bindir}/%{name}-fontlist %{_bindir}/%{bname}-fontlist -%{_datadir}/%{name} %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/fop.xconf