Hello community, here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2014-12-09 09:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-16 16:49:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes 2014-12-09 09:13:55.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 8 12:57:49 UTC 2014 - [email protected] + +- Spec-cleanify +- Do not ever run tests, we lack quite packages to do so anyway +- Drop fop-1.1-src.tar.gz.asc xmlgraphics-fop.keyring as upstream + does not provide those anymore +- Apply patch to build with new xmlgraphics-commons: + * fop-commons-2.0.patch + +------------------------------------------------------------------- Old: ---- fop-1.1-src.tar.gz.asc xmlgraphics-fop.keyring New: ---- fop-commons-2.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-fop.spec ++++++ --- /var/tmp/diff_new_pack.uMBd47/_old 2014-12-09 09:13:57.000000000 +0100 +++ /var/tmp/diff_new_pack.uMBd47/_new 2014-12-09 09:13:57.000000000 +0100 @@ -3,7 +3,6 @@ # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,21 +17,18 @@ # -%define section free %define bname fop - -%bcond_with tests - Name: xmlgraphics-fop Version: 1.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 #FIX-OPENSUSE: add xmlgraphics-commons to classpath Source1: %{name}.script -Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/xmlgraphics-fop-pom-template.pom +Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_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 @@ -40,32 +36,18 @@ Source10: %{name}.xml Source11: %{name}-fontmetrics.xml Source12: %{name}-fontlist.xml -Source1000: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz.asc -Source1001: xmlgraphics-fop.keyring Patch1: xmlgraphics-fop-cli.patch Patch2: xmlgraphics-fop-xconf.patch -Url: http://xmlgraphics.apache.org/fop/ -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Requires: apache-commons-io >= 2.4 -Requires: apache-commons-logging -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 +# PATCH-FIX-UPSTREAM: build with xmlgraphics-commons-2.0 +Patch3: fop-commons-2.0.patch BuildRequires: ant >= 1.6.5 -BuildRequires: ant-junit BuildRequires: apache-commons-io >= 2.4 BuildRequires: apache-commons-logging BuildRequires: avalon-framework BuildRequires: docbook-xsl-stylesheets -BuildRequires: gpg-offline BuildRequires: gpg2 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools -BuildRequires: junit BuildRequires: libxslt BuildRequires: qdox >= 1.12 BuildRequires: servlet_api @@ -73,13 +55,22 @@ BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xmlgraphics-batik BuildRequires: xmlgraphics-commons >= 1.5 -BuildRequires: xmlunit -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Requires: apache-commons-io >= 2.4 +Requires: apache-commons-logging +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(post): javapackages-tools +Requires(postun): javapackages-tools #!BuildIgnore: saxon Provides: %{bname} = %{version}-%{release} Obsoletes: %{bname} < %{version}-%{release} Provides: fo-formatter = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description FOP (Formatting Objects Processor) is driven by XSL formatting objects @@ -89,12 +80,12 @@ representation), Print, AWT, MIF, and TXT. %prep -%gpg_verify %{SOURCE1000} %setup -q -n %{bname}-%{version} -a5 ln -thyph offo-hyphenation/hyph/*.xml find -name "*.jar" | xargs -t rm %patch1 -p1 -b .cli %patch2 -p1 -b .cli +%patch3 -p1 -b .xml2 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: @@ -126,21 +117,18 @@ ln -s $(build-classpath xmlgraphics-batik/util) ln -s $(build-classpath xmlgraphics-batik/xml) ln -s $(build-classpath xmlgraphics-commons) -ln -s $(build-classpath xmlunit) ln -s $(build-classpath qdox) popd export CLASSPATH= LANG=en_US.UTF-8 -export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}` -%{ant} \ +export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/trax` +ant \ + -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ package \ -%if %{with tests} - junit \ -%endif maven-artifacts # false # Build the manpage(s) and HTML -DB=/usr/share/xml/docbook/stylesheet/nwalsh/current +DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do xsltproc $DB/manpages/docbook.xsl $m # Only filename for HTML is needed, remove anything before / @@ -172,17 +160,17 @@ 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}/etc/fop.xconf +install -D -m 644 conf/fop.xconf %{buildroot}%{_sysconfdir}/fop.xconf # Manpages -mkdir -p %{buildroot}%_mandir/man1 +mkdir -p %{buildroot}%{_mandir}/man1 for m in *.1; do gzip $m done -cp -vi *.1.gz %{buildroot}%_mandir/man1 +cp -vi *.1.gz %{buildroot}%{_mandir}/man1 # Remove prefix xmlgraphics to make also the linked manpage version available -pushd %{buildroot}%_mandir/man1 +pushd %{buildroot}%{_mandir}/man1 for m in *.1.gz; do ln -s $m ${m#*-} done @@ -204,6 +192,6 @@ %{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %{_mandir}/man1/* -%config(noreplace) /etc/fop.xconf +%config(noreplace) %{_sysconfdir}/fop.xconf %changelog ++++++ fop-commons-2.0.patch ++++++ >From 07f112a532b277e6ebada50f8654b3aacb8e9a47 Mon Sep 17 00:00:00 2001 From: Simon Steiner <[email protected]> Date: Thu, 21 Aug 2014 14:42:22 +0000 Subject: [PATCH] FOP-2353: PDF-A preflight warnings git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1619415 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/render/pdf/PDFRenderingUtil.java | 8 +++++++- .../fop/render/pdf/PDFStructureTreeBuilder.java | 16 ++++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) Index: fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java =================================================================== --- fop-1.1.orig/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +++ fop-1.1/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; +import java.util.ArrayList; import java.util.Map; import javax.xml.transform.Source; @@ -37,6 +38,7 @@ import org.apache.commons.logging.LogFac import org.apache.xmlgraphics.image.loader.util.ImageUtil; import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil; import org.apache.xmlgraphics.xmp.Metadata; +import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema; import org.apache.xmlgraphics.xmp.schemas.XMPBasicAdapter; import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema; @@ -352,8 +354,8 @@ class PDFRenderingUtil implements PDFCon public void renderXMPMetadata(XMPMetadata metadata) { Metadata docXMP = metadata.getMetadata(); Metadata fopXMP = PDFMetadata.createXMPFromPDFDocument(pdfDoc); - //Merge FOP's own metadata into the one from the XSL-FO document - fopXMP.mergeInto(docXMP); + ArrayList<Class> exclude = new ArrayList<Class>(); + fopXMP.mergeInto(docXMP, exclude); XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); //Metadata was changed so update metadata date xmpBasic.setMetadataDate(new java.util.Date()); ++++++ xmlgraphics-fop-pom-template.pom ++++++ --- /var/tmp/diff_new_pack.uMBd47/_old 2014-12-09 09:13:57.000000000 +0100 +++ /var/tmp/diff_new_pack.uMBd47/_new 2014-12-09 09:13:57.000000000 +0100 @@ -1,155 +1,155 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- $Id$ --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 -http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - <packaging>jar</packaging> - <name>Apache FOP</name> - <version>@version@</version> - <url>http://xmlgraphics.apache.org/fop/</url> - <description>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.</description> - <inceptionYear>1999</inceptionYear> - <mailingLists> - <mailingList> - <name>FOP Users List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive> - </mailingList> - <mailingList> - <name>FOP Developer List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive> - </mailingList> - <mailingList> - <name>FOP Commit List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive> - </mailingList> - </mailingLists> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection> - <url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url> - </scm> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>7</version> - </parent> - <dependencies> - <!-- XML Graphics --> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>xmlgraphics-commons</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-svg-dom</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-bridge</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-awt-util</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-gvt</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-transcoder</artifactId> - <version>1.7</version> - <exclusions> - <exclusion> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-extension</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-ext</artifactId> - <version>1.7</version> - </dependency> - <!-- other dependencies --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>4.3.1</version> - </dependency> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-impl</artifactId> - <version>4.3.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 +http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <packaging>jar</packaging> + <name>Apache FOP</name> + <version>@version@</version> + <url>http://xmlgraphics.apache.org/fop/</url> + <description>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.</description> + <inceptionYear>1999</inceptionYear> + <mailingLists> + <mailingList> + <name>FOP Users List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive> + </mailingList> + <mailingList> + <name>FOP Developer List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive> + </mailingList> + <mailingList> + <name>FOP Commit List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive> + </mailingList> + </mailingLists> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection> + <url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url> + </scm> + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>7</version> + </parent> + <dependencies> + <!-- XML Graphics --> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>xmlgraphics-commons</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-gvt</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-transcoder</artifactId> + <version>1.7</version> + <exclusions> + <exclusion> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-extension</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>1.7</version> + </dependency> + <!-- other dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-impl</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
