Hello community, here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2016-03-26 15:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old) and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes 2015-04-02 15:59:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes 2016-03-26 15:22:38.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Mar 8 08:52:41 UTC 2016 - [email protected] + +- Fix manpage for xmlgraphics-fop-fontmetrics + +------------------------------------------------------------------- +Thu Mar 3 12:05:58 UTC 2016 - [email protected] + +- Update to fop 2.1 + - https://xmlgraphics.apache.org/fop/changes.html#version_2.1 +- Remove upstreamed fop-commons-2.0.patch + and xmlgraphics-fop-xconf.patch +- Add hyphenation-more-stack.patch to fix build with offo 2.2 + +------------------------------------------------------------------- Old: ---- fop-1.1-src.tar.gz fop-commons-2.0.patch offo-hyphenation_v2.0.zip xmlgraphics-fop-xconf.patch New: ---- fop-2.1-src.tar.gz hyphenation-more-stack.patch offo-hyphenation.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-fop.spec ++++++ --- /var/tmp/diff_new_pack.4h52Gs/_old 2016-03-26 15:22:40.000000000 +0100 +++ /var/tmp/diff_new_pack.4h52Gs/_new 2016-03-26 15:22:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-fop # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -19,30 +19,29 @@ %define bname fop Name: xmlgraphics-fop -Version: 1.1 +Version: 2.1 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-1.1-src.tar.gz +Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-2.1-src.tar.gz #FIX-OPENSUSE: add xmlgraphics-commons to classpath Source1: %{name}.script -Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/xmlgraphics-fop-pom-template.pom +Source2: http://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.0/offo-hyphenation_v2.0.zip +Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip # Manpage(s) Source10: %{name}.xml Source11: %{name}-fontmetrics.xml Source12: %{name}-fontlist.xml Patch1: xmlgraphics-fop-cli.patch -Patch2: xmlgraphics-fop-xconf.patch -# PATCH-FIX-UPSTREAM: build with xmlgraphics-commons-2.0 -Patch3: fop-commons-2.0.patch +Patch2: hyphenation-more-stack.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-io >= 2.4 BuildRequires: apache-commons-logging +BuildRequires: apache-pdfbox BuildRequires: avalon-framework BuildRequires: docbook-xsl-stylesheets BuildRequires: gpg2 @@ -53,16 +52,17 @@ BuildRequires: servlet_api BuildRequires: unzip BuildRequires: xml-commons-jaxp-1.3-apis -BuildRequires: xmlgraphics-batik -BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: xmlgraphics-batik >= 1.8 +BuildRequires: xmlgraphics-commons >= 2.1 Requires: apache-commons-io >= 2.4 Requires: apache-commons-logging +Requires: apache-pdfbox Requires: avalon-framework Requires: java >= 1.6.0 Requires: javapackages-tools Requires: xml-commons-jaxp-1.3-apis -Requires: xmlgraphics-batik -Requires: xmlgraphics-commons >= 1.5 +Requires: xmlgraphics-batik >= 1.8 +Requires: xmlgraphics-commons >= 2.1 Requires(post): javapackages-tools Requires(postun): javapackages-tools #!BuildIgnore: saxon @@ -84,8 +84,7 @@ ln -thyph offo-hyphenation/hyph/*.xml find -name "*.jar" | xargs -t rm %patch1 -p1 -b .cli -%patch2 -p1 -b .cli -%patch3 -p1 -b .xml2 +%patch2 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: @@ -98,6 +97,7 @@ ln -s $(build-classpath avalon-framework) ln -s $(build-classpath commons-io) ln -s $(build-classpath commons-logging) +ln -s $(build-classpath fontbox) ln -s $(build-classpath servlet_api) ln -s $(build-classpath xml-commons-jaxp-1.3-apis) ln -s $(build-classpath xml-commons-jaxp-1.3-apis-ext) @@ -120,13 +120,8 @@ ln -s $(build-classpath qdox) popd export CLASSPATH= LANG=en_US.UTF-8 -export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/trax` -ant \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ - package \ - maven-artifacts +ant package maven-artifacts -# false # Build the manpage(s) and HTML DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do @@ -178,15 +173,15 @@ %files %defattr(0644,root,root,0755) -%doc NOTICE LICENSE README known-issues.xml status.xml +%doc NOTICE LICENSE README known-issues.xml %doc *.html %attr(0755,root,root) %{_bindir}/%{name} -%attr(0755,root,root) %{_bindir}/%{bname} +%{_bindir}/%{bname} %attr(0755,root,root) %{_bindir}/%{name}-fontmetrics -%attr(0755,root,root) %{_bindir}/%{bname}-fontmetrics +%{_bindir}/%{bname}-fontmetrics %attr(0755,root,root) %{_bindir}/%{name}-fontlist -%attr(0755,root,root) %{_bindir}/%{bname}-fontlist +%{_bindir}/%{bname}-fontlist %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_mavenpomdir}/* ++++++ fop-1.1-src.tar.gz -> fop-2.1-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/xmlgraphics-fop/fop-1.1-src.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/fop-2.1-src.tar.gz differ: char 12, line 1 ++++++ hyphenation-more-stack.patch ++++++ --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: fop-2.1/build.xml =================================================================== --- fop-2.1.orig/build.xml +++ fop-2.1/build.xml @@ -181,7 +181,7 @@ list of possible build targets. <property name="lib.dir" value="${basedir}/lib"/> <property name="user.hyph.dir" value="${basedir}/hyph"/> <property name="unidata.dir" value="${basedir}/UNIDATA"/> - <property name="hyph.stacksize" value="512k"/> + <property name="hyph.stacksize" value="1M"/> <property name="test.dir" value="${basedir}/test"/> <property name="build.dir" value="${basedir}/build"/> <property name="build.gensrc.dir" value="${build.dir}/gensrc"/> ++++++ xmlgraphics-fop-fontmetrics.xml ++++++ --- /var/tmp/diff_new_pack.4h52Gs/_old 2016-03-26 15:22:40.000000000 +0100 +++ /var/tmp/diff_new_pack.4h52Gs/_new 2016-03-26 15:22:40.000000000 +0100 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd"; [ - <!ENTITY product "xmlgraphics-fop-fontmetric"> + <!ENTITY product "xmlgraphics-fop-fontmetrics"> ]> <refentry id="fop-fontmetrics"> <refentryinfo> ++++++ xmlgraphics-fop-pom-template.pom ++++++ --- /var/tmp/diff_new_pack.4h52Gs/_old 2016-03-26 15:22:40.000000000 +0100 +++ /var/tmp/diff_new_pack.4h52Gs/_new 2016-03-26 15:22:40.000000000 +0100 @@ -75,32 +75,32 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> - <version>1.5</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-svg-dom</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-bridge</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-awt-util</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-gvt</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-transcoder</artifactId> - <version>1.7</version> + <version>1.8</version> <exclusions> <exclusion> <groupId>org.apache.xmlgraphics</groupId> @@ -111,12 +111,12 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-extension</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-ext</artifactId> - <version>1.7</version> + <version>1.8</version> </dependency> <!-- other dependencies --> <dependency> @@ -132,12 +132,12 @@ <dependency> <groupId>org.apache.avalon.framework</groupId> <artifactId>avalon-framework-api</artifactId> - <version>4.2.0</version> + <version>4.3.1</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.avalon.framework</groupId> <artifactId>avalon-framework-impl</artifactId> - <version>4.2.0</version> + <version>4.3.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -148,7 +148,7 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> <scope>provided</scope> </dependency> </dependencies>
