From 12e6e56faf11f8afb23d1331373132bec15f7eaf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Apr 15 2013 14:37:22 +0000 Subject: 1.1, use icc free color profile --- diff --git a/.gitignore b/.gitignore index c7cf340..93e4d32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ fop-0.95-src.tar.gz fop-1.0-src.tar.gz /event-model.tgz +/fop-1.1-src.tar.gz diff --git a/fop-1.0.pom b/fop-1.0.pom deleted file mode 100644 index 46b43c4..0000000 --- a/fop-1.0.pom +++ /dev/null @@ -1,150 +0,0 @@ - - - - - 4.0.0 - org.apache.xmlgraphics - fop - jar - Apache FOP - 1.0 - 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 - - - FOP Users List - fop-users-subscribe@xmlgraphics.apache.org - fop-users-unsubscribe@xmlgraphics.apache.org - http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/ - - - FOP Developer List - fop-dev-subscribe@xmlgraphics.apache.org - fop-dev-unsubscribe@xmlgraphics.apache.org - http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/ - - - FOP Commit List - fop-commits-subscribe@xmlgraphics.apache.org - fop-commits-unsubscribe@xmlgraphics.apache.org - http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/ - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk - scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk - http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.xmlgraphics - xmlgraphics-commons - 1.4 - - - org.apache.xmlgraphics - batik-svg-dom - 1.7 - - - org.apache.xmlgraphics - batik-bridge - 1.7 - - - org.apache.xmlgraphics - batik-awt-util - 1.7 - - - org.apache.xmlgraphics - batik-gvt - 1.7 - - - org.apache.xmlgraphics - batik-transcoder - 1.7 - - - org.apache.xmlgraphics - fop - - - - - org.apache.xmlgraphics - batik-extension - 1.7 - - - org.apache.xmlgraphics - batik-ext - 1.7 - - - - commons-logging - commons-logging - 1.0.4 - - - commons-io - commons-io - 1.3.1 - - - org.apache.avalon.framework - avalon-framework-api - 4.3.1 - - - org.apache.avalon.framework - avalon-framework-impl - 4.3.1 - - - javax.servlet - servlet-api - 2.2 - provided - - - xalan - xalan - 2.7.0 - provided - - - diff --git a/fop-1.1.pom b/fop-1.1.pom new file mode 100644 index 0000000..bbad61a --- /dev/null +++ b/fop-1.1.pom @@ -0,0 +1,155 @@ + + + + + 4.0.0 + org.apache.xmlgraphics + fop + jar + Apache FOP + 1.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 + + + FOP Users List + fop-users-subscribe@xmlgraphics.apache.org + fop-users-unsubscribe@xmlgraphics.apache.org + http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/ + + + FOP Developer List + fop-dev-subscribe@xmlgraphics.apache.org + fop-dev-unsubscribe@xmlgraphics.apache.org + http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/ + + + FOP Commit List + fop-commits-subscribe@xmlgraphics.apache.org + fop-commits-unsubscribe@xmlgraphics.apache.org + http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/ + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk + scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk + http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN + + + Apache Software Foundation + http://www.apache.org/ + + + org.apache + apache + 7 + + + + + org.apache.xmlgraphics + xmlgraphics-commons + 1.5 + + + org.apache.xmlgraphics + batik-svg-dom + 1.7 + + + org.apache.xmlgraphics + batik-bridge + 1.7 + + + org.apache.xmlgraphics + batik-awt-util + 1.7 + + + org.apache.xmlgraphics + batik-gvt + 1.7 + + + org.apache.xmlgraphics + batik-transcoder + 1.7 + + + org.apache.xmlgraphics + fop + + + + + org.apache.xmlgraphics + batik-extension + 1.7 + + + org.apache.xmlgraphics + batik-ext + 1.7 + + + + commons-logging + commons-logging + 1.0.4 + + + commons-io + commons-io + 1.3.1 + + + org.apache.avalon.framework + avalon-framework-api + 4.2.0 + + + org.apache.avalon.framework + avalon-framework-impl + 4.2.0 + + + javax.servlet + servlet-api + 2.2 + provided + + + xalan + xalan + 2.7.0 + provided + + + diff --git a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch b/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch new file mode 100644 index 0000000..aae3edb --- /dev/null +++ b/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch @@ -0,0 +1,42 @@ +From 275f22df6791135dde308f76cf4b2f7ec30f1840 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 12 Apr 2013 15:43:11 +0200 +Subject: [PATCH] Use sRGB.icc color profile from icc-profiles-openicc package + +It's a replacement for non-free color profile shipped with fop +--- + src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +index 60fea88..e041344 100644 +--- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +@@ -21,8 +21,10 @@ package org.apache.fop.pdf; + + import java.awt.color.ColorSpace; + import java.awt.color.ICC_Profile; ++import java.io.FileNotFoundException; + import java.io.IOException; + import java.io.InputStream; ++import java.io.FileInputStream; + + import org.apache.commons.io.IOUtils; + +@@ -137,7 +139,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { + public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { + ICC_Profile profile; + PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); +- InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm"); ++ InputStream in; ++ try { ++ in = new FileInputStream("/usr/share/color/icc/OpenICC/sRGB.icc"); ++ } catch (FileNotFoundException e) { ++ in = null; ++ } + if (in != null) { + try { + profile = ColorProfileUtil.getICC_Profile(in); +-- +1.8.1.4 + diff --git a/fop-manifest.patch b/fop-manifest.patch deleted file mode 100644 index d1e23a9..0000000 --- a/fop-manifest.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -uN fop-1.0/build.xml fop-1.0-mod/build.xml ---- fop-1.0/build.xml 2010-07-13 05:34:37.000000000 +1000 -+++ fop-1.0-mod/build.xml 2011-03-10 14:42:17.000000000 +1000 -@@ -517,10 +517,10 @@ - - - -- -+ - -- -- - -
- - ---- fop-1.0/fop.mf 2011-03-10 14:53:21.000000000 +1000 -+++ fop-1.0-mod/fop.mf 2011-03-10 14:53:21.000000000 +1000 -@@ -0,0 +1,3 @@ -+Manifest-Version: 1.0 -+Main-Class: org.apache.fop.cli.Main -+ - diff --git a/fop.spec b/fop.spec index 082f0cf..5fe9470 100644 --- a/fop.spec +++ b/fop.spec @@ -1,18 +1,26 @@ Summary: XSL-driven print formatter Name: fop -Version: 1.0 -Release: 21%{?dist} +Version: 1.1 +Release: 1%{?dist} License: ASL 2.0 Group: Applications/Text URL: http://xmlgraphics.apache.org/fop -Source0: http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz +# wget http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz +# tar xzvf fop-%{version}-src.tar.gz +# find ./fop-%{version}/src/java/org/apache/fop/pdf/ -name "*.icm*" -delete +# find ./fop-%{version}/ -name "*.jar" -delete +# find ./fop-%{version}/ -name "*.pdf" -delete +# we don't run tests, we don't need test data +# find ./fop-%{version}/ -name "*.ser" -delete +# tar czvf fop-%{version}-src.tar.gz fop-%{version} +Source0: %{name}-%{version}-src.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom -Patch0: %{name}-manifest.patch -Patch1: %{name}-main.patch +Patch0: %{name}-main.patch +Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch BuildArch: noarch -Requires: xmlgraphics-commons >= 1.2 +Requires: xmlgraphics-commons >= 1.5 Requires: avalon-framework >= 4.1.4 Requires: batik >= 1.7 Requires: xalan-j2 >= 2.7.0 @@ -21,6 +29,7 @@ Requires: jakarta-commons-httpclient Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 Requires: java >= 1:1.6.0 +Requires: icc-profiles-openicc Requires: jpackage-utils Requires(post): jpackage-utils @@ -33,7 +42,7 @@ BuildRequires: jpackage-utils BuildRequires: apache-commons-logging BuildRequires: apache-commons-io BuildRequires: avalon-framework -BuildRequires: xmlgraphics-commons +BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: batik BuildRequires: servlet BuildRequires: qdox @@ -59,8 +68,8 @@ Javadoc for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p0 +%patch0 -p0 +%patch1 -p1 find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; @@ -132,6 +141,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Fri Apr 12 2013 Michal Srb - 1.1-1 +- Update to upstream version 1.1 +- Replace proprietary color profile with free CP from icc-profiles-openicc package +- Resolves: rhbz#848659 + * Wed Feb 13 2013 Fedora Release Engineering - 1.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 49c53ca..194b282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95dcc4c2dd08b4bc88ce9ce1ee88c439 fop-1.0-src.tar.gz +2ff020ee2b403bebe373ff3827d0a9b2 fop-1.1-src.tar.gz