From 4729d9f4f317c5df6b181b9b44b60825b8ccba4d Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Sat, 17 Nov 2012 11:52:47 -0500 Subject: [PATCH 01/73] Made changes per BZ 825463 --- fop.script | 2 +- fop.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fop.script b/fop.script index 8e688e4..6aa64ff 100644 --- a/fop.script +++ b/fop.script @@ -26,7 +26,7 @@ MAIN_CLASS=org.apache.fop.cli.Main # Set parameters set_jvm set_classpath commons-io batik-all avalon-framework-api \ - avalon-framework-impl xmlgraphics-commons \ + avalon-framework-impl xmlgraphics-commons xml-commons-apis-ext \ commons-logging fop set_flags $BASE_FLAGS set_options $BASE_OPTIONS diff --git a/fop.spec b/fop.spec index 0722c37..24fc2fb 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Summary: XSL-driven print formatter Name: fop Version: 1.0 -Release: 19%{?dist} +Release: 20%{?dist} License: ASL 2.0 Group: Applications/Text URL: http://xmlgraphics.apache.org/fop @@ -132,6 +132,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Fri May 25 2012 Mikolaj Izdebski - 1.0-19 +- Add xml-commons-apis-ext to classpath + * Thu Jul 19 2012 Fedora Release Engineering - 1.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From f76f5a6407326e133d1f43461e2f834f0687a990 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Sun, 18 Nov 2012 17:44:01 -0500 Subject: [PATCH 02/73] Fixed changelog --- fop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 24fc2fb..864b423 100644 --- a/fop.spec +++ b/fop.spec @@ -132,7 +132,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog -* Fri May 25 2012 Mikolaj Izdebski - 1.0-19 +* Sun Nov 18 2012 Mikolaj Izdebski - 1.0-20 - Add xml-commons-apis-ext to classpath * Thu Jul 19 2012 Fedora Release Engineering - 1.0-19 From de62a378da759f2ed0af377100d4b28aea8295ae Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Mon, 19 Nov 2012 20:46:24 -0500 Subject: [PATCH 03/73] Fixes per BZ 825463 --- fop.script | 2 +- fop.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fop.script b/fop.script index 8e688e4..6aa64ff 100644 --- a/fop.script +++ b/fop.script @@ -26,7 +26,7 @@ MAIN_CLASS=org.apache.fop.cli.Main # Set parameters set_jvm set_classpath commons-io batik-all avalon-framework-api \ - avalon-framework-impl xmlgraphics-commons \ + avalon-framework-impl xmlgraphics-commons xml-commons-apis-ext \ commons-logging fop set_flags $BASE_FLAGS set_options $BASE_OPTIONS diff --git a/fop.spec b/fop.spec index 0722c37..864b423 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Summary: XSL-driven print formatter Name: fop Version: 1.0 -Release: 19%{?dist} +Release: 20%{?dist} License: ASL 2.0 Group: Applications/Text URL: http://xmlgraphics.apache.org/fop @@ -132,6 +132,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Sun Nov 18 2012 Mikolaj Izdebski - 1.0-20 +- Add xml-commons-apis-ext to classpath + * Thu Jul 19 2012 Fedora Release Engineering - 1.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 359a59e4649cd1eb73853ace1ce0ae3f925dc216 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 15:52:55 -0600 Subject: [PATCH 04/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 864b423..082f0cf 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Summary: XSL-driven print formatter Name: fop Version: 1.0 -Release: 20%{?dist} +Release: 21%{?dist} License: ASL 2.0 Group: Applications/Text URL: http://xmlgraphics.apache.org/fop @@ -132,6 +132,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Nov 18 2012 Mikolaj Izdebski - 1.0-20 - Add xml-commons-apis-ext to classpath From 12e6e56faf11f8afb23d1331373132bec15f7eaf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 Apr 2013 10:37:22 -0400 Subject: [PATCH 05/73] 1.1, use icc free color profile --- .gitignore | 1 + fop-1.0.pom => fop-1.1.pom | 17 +++++--- ...or-profile-from-icc-profiles-openicc.patch | 42 +++++++++++++++++++ fop-manifest.patch | 25 ----------- fop.spec | 32 ++++++++++---- sources | 2 +- 6 files changed, 78 insertions(+), 41 deletions(-) rename fop-1.0.pom => fop-1.1.pom (91%) create mode 100644 fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch delete mode 100644 fop-manifest.patch 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.1.pom similarity index 91% rename from fop-1.0.pom rename to fop-1.1.pom index 46b43c4..bbad61a 100644 --- a/fop-1.0.pom +++ b/fop-1.1.pom @@ -19,13 +19,13 @@ +http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.xmlgraphics fop jar Apache FOP - 1.0 + 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 @@ -59,18 +59,23 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 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 + 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.4 + 1.5 org.apache.xmlgraphics @@ -127,12 +132,12 @@ http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.avalon.framework avalon-framework-api - 4.3.1 + 4.2.0 org.apache.avalon.framework avalon-framework-impl - 4.3.1 + 4.2.0 javax.servlet 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 From c893d8dfa794ff19666d1d7a39fb048eb914ce7a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 Apr 2013 10:52:06 -0400 Subject: [PATCH 06/73] update to 1.1, drop non-free color profile and use icc instead --- fop-1.0.pom => fop-1.1.pom | 17 +++++--- ...or-profile-from-icc-profiles-openicc.patch | 42 +++++++++++++++++++ fop-manifest.patch | 25 ----------- fop.spec | 32 ++++++++++---- sources | 2 +- 5 files changed, 77 insertions(+), 41 deletions(-) rename fop-1.0.pom => fop-1.1.pom (91%) create mode 100644 fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch delete mode 100644 fop-manifest.patch diff --git a/fop-1.0.pom b/fop-1.1.pom similarity index 91% rename from fop-1.0.pom rename to fop-1.1.pom index 46b43c4..bbad61a 100644 --- a/fop-1.0.pom +++ b/fop-1.1.pom @@ -19,13 +19,13 @@ +http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.xmlgraphics fop jar Apache FOP - 1.0 + 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 @@ -59,18 +59,23 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 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 + 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.4 + 1.5 org.apache.xmlgraphics @@ -127,12 +132,12 @@ http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.avalon.framework avalon-framework-api - 4.3.1 + 4.2.0 org.apache.avalon.framework avalon-framework-impl - 4.3.1 + 4.2.0 javax.servlet 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 From 5f444749b4acfbeffc4276196bd0a1f704ef67ed Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 24 Jun 2013 11:28:14 +0200 Subject: [PATCH 07/73] Build from clean tarball - Spec file clean up Signed-off-by: Mikolaj Izdebski --- .gitignore | 1 + clean-tarball.sh | 30 +++++++++++++++++ fop.spec | 86 +++++++++++++++++------------------------------- sources | 2 +- 4 files changed, 62 insertions(+), 57 deletions(-) create mode 100755 clean-tarball.sh diff --git a/.gitignore b/.gitignore index 93e4d32..ccfeeb2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ fop-0.95-src.tar.gz fop-1.0-src.tar.gz /event-model.tgz /fop-1.1-src.tar.gz +/fop-1.1-clean.tar.gz diff --git a/clean-tarball.sh b/clean-tarball.sh new file mode 100755 index 0000000..abdde65 --- /dev/null +++ b/clean-tarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: ./clean-tarball VERSION" + exit 1 +fi + +VERSION=${1} +NAME="fop" + +wget http://archive.apache.org/dist/xmlgraphics/fop/source/${NAME}-${VERSION}-src.tar.gz +tar xvf ${NAME}-${VERSION}-src.tar.gz + +( + cd ${NAME}-${VERSION} + # non-free color profile + find src/java/org/apache/fop/pdf/ -name "*.icm*" -delete + find ./ -name "*.jar" -delete + find ./ -name "*.pdf" -delete + # serialized objects + find ./${NAME}-${VERSION}/ -name "*.ser" -delete + # examples, tests, ... + rm -Rf lib/ examples/ test/ hyph/ + rm -Rf src/documentation/ + mkdir -p lib/build/ +) + +tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} +rm -Rf ${NAME}-${VERSION}.tar.gz + diff --git a/fop.spec b/fop.spec index 5fe9470..895e5cc 100644 --- a/fop.spec +++ b/fop.spec @@ -1,25 +1,19 @@ -Summary: XSL-driven print formatter Name: fop +Summary: XSL-driven print formatter Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 -Group: Applications/Text URL: http://xmlgraphics.apache.org/fop -# 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 +# ./clean-tarball %{version} +Source0: %{name}-%{version}-clean.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}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch -BuildArch: noarch + +BuildArch: noarch + Requires: xmlgraphics-commons >= 1.5 Requires: avalon-framework >= 4.1.4 Requires: batik >= 1.7 @@ -28,17 +22,11 @@ Requires: xml-commons-apis >= 1.3.04 Requires: jakarta-commons-httpclient Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 -Requires: java >= 1:1.6.0 +Requires: java Requires: icc-profiles-openicc -Requires: jpackage-utils - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils BuildRequires: ant -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: java-javadoc >= 1:1.6.0 -BuildRequires: jpackage-utils +BuildRequires: java-devel BuildRequires: apache-commons-logging BuildRequires: apache-commons-io BuildRequires: avalon-framework @@ -60,8 +48,6 @@ XT) SAX events. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -71,9 +57,6 @@ Javadoc for %{name}. %patch0 -p0 %patch1 -p1 -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; - sed -i -e "s|1.4|1.5|g" build.xml #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 @@ -86,61 +69,52 @@ ant jar-main transcoder-pkg javadocs %install # inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE2} META-INF/MANIFEST.MF +install -d -m 755 META-INF +install -p -m 644 %{SOURCE2} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u build/%{name}.jar META-INF/MANIFEST.MF # jars -mkdir -p %{buildroot}%{_javadir} -cp -a build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -cp -a build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar # script -mkdir -p %{buildroot}%{_bindir} -cp -a %{SOURCE1} %{buildroot}%{_bindir}/fop +install -d -m 755 %{buildroot}%{_bindir} +install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/fop # data -mkdir -p %{buildroot}%{_datadir}/%{name} -cp -a conf %{buildroot}%{_datadir}/%{name} +install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf +cp -rp conf/* %{buildroot}%{_datadir}/%{name}/conf # javadoc -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -a build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -rp build/javadocs/* %{buildroot}%{_javadocdir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} %{version} - -%pre javadoc -# workaround for rpm bug 646523, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(-,root,root,-) %doc LICENSE README NOTICE %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_javadir}/pdf-transcoder.jar -%{_mavendepmapfragdir}/* -%{_mavenpomdir}/*pom -%attr(0755,root,root) %{_bindir}/fop +%{_mavendepmapfragdir}/%{name} +%{_mavenpomdir}/JPP-%{name}.pom +%{_bindir}/fop %files javadoc -%defattr(-,root,root,-) %doc %{_javadocdir}/%{name} %doc LICENSE %changelog +* Fri Jun 21 2013 Michal Srb - 1.1-2 +- Build from clean tarball +- Spec file clean up + * 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 diff --git a/sources b/sources index 194b282..5244438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ff020ee2b403bebe373ff3827d0a9b2 fop-1.1-src.tar.gz +0eaef1991f1dbc1fcfb238c918cecbf3 fop-1.1-clean.tar.gz From 60aff48dceb7f4cecc918daec1fea1f9b0ea5f5f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 06:40:26 -0500 Subject: [PATCH 08/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 895e5cc..6c098b2 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://xmlgraphics.apache.org/fop # ./clean-tarball %{version} @@ -111,6 +111,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jun 21 2013 Michal Srb - 1.1-2 - Build from clean tarball - Spec file clean up From a1305e3875584afd14eba210bd933590452bfcdb Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 2 Jul 2013 11:08:18 +0200 Subject: [PATCH 09/73] Fix license tag (Resolves: rhbz#979394) - Add ASL 1.1 license text Signed-off-by: Mikolaj Izdebski --- .gitignore | 1 + fop.spec | 18 ++++++++++++++---- sources | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ccfeeb2..9ab3c16 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ fop-1.0-src.tar.gz /event-model.tgz /fop-1.1-src.tar.gz /fop-1.1-clean.tar.gz +/LICENSE-1.1.txt diff --git a/fop.spec b/fop.spec index 6c098b2..8f57679 100644 --- a/fop.spec +++ b/fop.spec @@ -1,14 +1,18 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 3%{?dist} -License: ASL 2.0 +Release: 4%{?dist} +# ASL 1.1: +# several files in src/java/org/apache/fop/render/awt/viewer/resources/ +# rest is ASL 2.0 +License: ASL 2.0 and ASL 1.1 URL: http://xmlgraphics.apache.org/fop # ./clean-tarball %{version} Source0: %{name}-%{version}-clean.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 +Source4: http://www.apache.org/licenses/LICENSE-1.1.txt Patch0: %{name}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch @@ -57,6 +61,8 @@ Javadoc for %{name}. %patch0 -p0 %patch1 -p1 +cp %{SOURCE4} LICENSE-1.1 + sed -i -e "s|1.4|1.5|g" build.xml #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 @@ -97,7 +103,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %files -%doc LICENSE README NOTICE +%doc LICENSE LICENSE-1.1 README NOTICE %{_javadir}/%{name}.jar %{_datadir}/%{name} %{_javadir}/pdf-transcoder.jar @@ -107,10 +113,14 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %files javadoc %doc %{_javadocdir}/%{name} -%doc LICENSE +%doc LICENSE LICENSE-1.1 %changelog +* Wed Sep 18 2013 Michal Srb - 1.1-4 +- Fix license tag (Resolves: rhbz#979394) +- Add ASL 1.1 license text + * Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 5244438..1887526 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0eaef1991f1dbc1fcfb238c918cecbf3 fop-1.1-clean.tar.gz +92afa66b413bb09a3bbd590091a836f5 LICENSE-1.1.txt From 77fb4f306b2d9cc93d3c68db094b54f8a08da6d7 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 7 Nov 2013 13:03:58 +0200 Subject: [PATCH 10/73] Fix the OSGi manifest. And a few rpmlint warnings. --- batik-pdf-MANIFEST.MF | 30 +++++++++++------------------- fop.spec | 9 ++++++--- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/batik-pdf-MANIFEST.MF b/batik-pdf-MANIFEST.MF index 15c910d..f1ce8c1 100644 --- a/batik-pdf-MANIFEST.MF +++ b/batik-pdf-MANIFEST.MF @@ -2,27 +2,19 @@ Manifest-Version: 1.0 Main-Class: org.apache.fop.cli.Main Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-SymbolicName: org.apache.batik.pdf -Import-Package: org.apache.batik.bridge;version="[1.6.0,1.7.0)",org.ap - ache.batik.dom.svg;version="[1.6.0,1.7.0)",org.apache.batik.dom.util; - version="[1.6.0,1.7.0)",org.apache.batik.ext.awt;version="[1.6.0,1.7. - 0)",org.apache.batik.ext.awt.g2d;version="[1.6.0,1.7.0)",org.apache.b - atik.gvt;version="[1.6.0,1.7.0)",org.apache.batik.gvt.renderer;versio - n="[1.6.0,1.7.0)",org.apache.batik.gvt.text;version="[1.6.0,1.7.0)",o - rg.apache.batik.transcoder;version="[1.6.0,1.7.0)",org.apache.batik.t - ranscoder.image;version="[1.6.0,1.7.0)",org.apache.batik.transcoder.k - eys;version="[1.6.0,1.7.0)",org.apache.batik.util;version="[1.6.0,1.7 - .0)",org.w3c.dom +Import-Package: org.apache.batik.bridge,org.apache.batik.dom.svg,org.a + pache.batik.dom.util,org.apache.batik.ext.awt,org.apache.batik.ext.aw + t.g2d,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.apache.b + atik.gvt.text,org.apache.batik.transcoder,org.apache.batik.transcoder + .image,org.apache.batik.transcoder.keys,org.apache.batik.util,org.w3c + .dom Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Localization: plugin Bundle-Version: 1.6.0.v200806031500 Bundle-Vendor: %Bundle-Vendor -Export-Package: org.apache.avalon.framework,org.apache.avalon.framewor - k.activity,org.apache.avalon.framework.configuration,org.apache.avalo - n.framework.container,org.apache.commons.io,org.apache.commons.io.out - put,org.apache.commons.logging,org.apache.commons.logging.impl,org.ap - ache.fop.apps,org.apache.fop.fo,org.apache.fop.fonts,org.apache.fop.f - onts.apps,org.apache.fop.fonts.base14,org.apache.fop.fonts.truetype,o - rg.apache.fop.fonts.type1,org.apache.fop.image,org.apache.fop.image.a - nalyser,org.apache.fop.pdf,org.apache.fop.render.pdf,org.apache.fop.r - ender.ps,org.apache.fop.svg,org.apache.fop.util +Export-Package: org.apache.fop.apps,org.apache.fop.fo,org.apache.fop.f + onts,org.apache.fop.fonts.apps,org.apache.fop.fonts.base14,org.apache + .fop.fonts.truetype,org.apache.fop.fonts.type1,org.apache.fop.image,o + rg.apache.fop.image.analyser,org.apache.fop.pdf,org.apache.fop.render + .pdf,org.apache.fop.render.ps,org.apache.fop.svg,org.apache.fop.util diff --git a/fop.spec b/fop.spec index 8f57679..2824b31 100644 --- a/fop.spec +++ b/fop.spec @@ -1,13 +1,13 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 License: ASL 2.0 and ASL 1.1 URL: http://xmlgraphics.apache.org/fop -# ./clean-tarball %{version} +# ./clean-tarball %%{version} Source0: %{name}-%{version}-clean.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF @@ -117,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu Nov 7 2013 Krzysztof Daniel 1.1-5 +- Fix the OSGi manifest. + * Wed Sep 18 2013 Michal Srb - 1.1-4 - Fix license tag (Resolves: rhbz#979394) - Add ASL 1.1 license text @@ -167,7 +170,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom * Thu Mar 10 2011 Rüdiger Landmann 1.0-11 - drop obsolete manifest patch -* Wed Mar 10 2011 Rüdiger Landmann 1.0-10 +* Thu Mar 10 2011 Rüdiger Landmann 1.0-10 - import 1.0 into Fedora, based on Mandriva package * Tue Feb 08 2011 Fedora Release Engineering - 1.0-9 From 0c11a113c98badca0ab4936a2d401fe2374cfb4d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 2 Jan 2014 15:41:47 +0000 Subject: [PATCH 11/73] Drop the icc-profiles-openicc requirement Switch to using the colord sRGB profile filename. Resolves: #1042655 --- ...sRGB.icc-color-profile-from-icc-profiles-openicc.patch | 4 ++-- fop.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 index aae3edb..a40018a 100644 --- a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch +++ b/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH] Use sRGB.icc color profile from colord package It's a replacement for non-free color profile shipped with fop --- @@ -30,7 +30,7 @@ index 60fea88..e041344 100644 - InputStream in = PDFDocument.class.getResourceAsStream("sRGB Color Space Profile.icm"); + InputStream in; + try { -+ in = new FileInputStream("/usr/share/color/icc/OpenICC/sRGB.icc"); ++ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); + } catch (FileNotFoundException e) { + in = null; + } diff --git a/fop.spec b/fop.spec index 2824b31..46c8e4b 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -27,7 +27,6 @@ Requires: jakarta-commons-httpclient Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 Requires: java -Requires: icc-profiles-openicc BuildRequires: ant BuildRequires: java-devel @@ -117,6 +116,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu Jan 2 2014 Richard Hughes 1.1-6 +- Drop the icc-profiles-openicc requirement and switch to using the colord sRGB + profile filename. +- Resolves: #1042655 + * Thu Nov 7 2013 Krzysztof Daniel 1.1-5 - Fix the OSGi manifest. From a7962c4081de51f4ff8cb4c3b8d4df3343626b96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 07:34:08 -0500 Subject: [PATCH 12/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 46c8e4b..44ec327 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -116,6 +116,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Jan 2 2014 Richard Hughes 1.1-6 - Drop the icc-profiles-openicc requirement and switch to using the colord sRGB profile filename. From 8f850881f5110dd517bcbc2167e3e19a696e2cf5 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 16 Jun 2014 08:13:50 +0200 Subject: [PATCH 13/73] Fix FTBFS --- fop.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fop.spec b/fop.spec index 44ec327..8373e5f 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -101,13 +101,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -%files +%files -f .mfiles %doc LICENSE LICENSE-1.1 README NOTICE -%{_javadir}/%{name}.jar %{_datadir}/%{name} %{_javadir}/pdf-transcoder.jar -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP-%{name}.pom %{_bindir}/fop %files javadoc @@ -116,6 +113,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Mon Jun 16 2014 Michal Srb - 1.1-8 +- Fix FTBFS + * Sat Jun 07 2014 Fedora Release Engineering - 1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 08a56e4ea965909df980cc71c504c985310732d6 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 11:36:49 +0100 Subject: [PATCH 14/73] Port to current QDox and xmlgraphics-commons --- 0001-Port-to-xmlgraphics-commons-2.0.patch | 25 ++++ 0002-Port-to-QDox-2.0.patch | 159 +++++++++++++++++++++ fop.spec | 9 +- 3 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 0001-Port-to-xmlgraphics-commons-2.0.patch create mode 100644 0002-Port-to-QDox-2.0.patch diff --git a/0001-Port-to-xmlgraphics-commons-2.0.patch b/0001-Port-to-xmlgraphics-commons-2.0.patch new file mode 100644 index 0000000..7691728 --- /dev/null +++ b/0001-Port-to-xmlgraphics-commons-2.0.patch @@ -0,0 +1,25 @@ +From a73c52951332b8399dd74e3482d283e0394bf741 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 16 Mar 2015 16:20:10 +0100 +Subject: [PATCH 1/2] Port to xmlgraphics-commons-2.0 + +--- + src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +index 1f49de7..81608ed 100644 +--- a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java ++++ b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +@@ -353,7 +353,7 @@ class PDFRenderingUtil implements PDFConfigurationConstants { + 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); ++ fopXMP.mergeInto(docXMP, java.util.Collections.emptyList()); + XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); + //Metadata was changed so update metadata date + xmpBasic.setMetadataDate(new java.util.Date()); +-- +2.1.0 + diff --git a/0002-Port-to-QDox-2.0.patch b/0002-Port-to-QDox-2.0.patch new file mode 100644 index 0000000..a82efd7 --- /dev/null +++ b/0002-Port-to-QDox-2.0.patch @@ -0,0 +1,159 @@ +From 4b72b9270d7362741548e1aa21a1ee868f0be882 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 17 Mar 2015 10:59:41 +0100 +Subject: [PATCH 2/2] Port to QDox 2.0 + +--- + .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- + 1 file changed, 22 insertions(+), 37 deletions(-) + +diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +index c6674ba..e39bf50 100644 +--- a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java ++++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +@@ -21,6 +21,7 @@ package org.apache.fop.tools; + + import java.io.File; + import java.io.IOException; ++import java.util.Collection; + import java.util.Collections; + import java.util.List; + import java.util.Map; +@@ -31,14 +32,11 @@ import org.apache.fop.events.model.EventModel; + import org.apache.fop.events.model.EventProducerModel; + import org.apache.fop.events.model.EventSeverity; + +-import com.thoughtworks.qdox.JavaDocBuilder; +-import com.thoughtworks.qdox.model.DefaultDocletTagFactory; ++import com.thoughtworks.qdox.JavaProjectBuilder; + import com.thoughtworks.qdox.model.DocletTag; +-import com.thoughtworks.qdox.model.DocletTagFactory; + import com.thoughtworks.qdox.model.JavaClass; + import com.thoughtworks.qdox.model.JavaMethod; + import com.thoughtworks.qdox.model.JavaParameter; +-import com.thoughtworks.qdox.model.Type; + + /** + * Finds EventProducer interfaces and builds the event model for them. +@@ -61,22 +59,12 @@ class EventProducerCollector { + PRIMITIVE_MAP = Collections.unmodifiableMap(m); + } + +- private DocletTagFactory tagFactory; + private List models = new java.util.ArrayList(); + + /** + * Creates a new EventProducerCollector. + */ + EventProducerCollector() { +- this.tagFactory = createDocletTagFactory(); +- } +- +- /** +- * Creates the {@link DocletTagFactory} to be used by the collector. +- * @return the doclet tag factory +- */ +- protected DocletTagFactory createDocletTagFactory() { +- return new DefaultDocletTagFactory(); + } + + /** +@@ -89,12 +77,11 @@ class EventProducerCollector { + */ + public boolean scanFile(File src) + throws IOException, EventConventionException, ClassNotFoundException { +- JavaDocBuilder builder = new JavaDocBuilder(this.tagFactory); ++ JavaProjectBuilder builder = new JavaProjectBuilder(); + builder.addSource(src); +- JavaClass[] classes = builder.getClasses(); ++ Collection classes = builder.getClasses(); + boolean eventProducerFound = false; +- for (int i = 0, c = classes.length; i < c; i++) { +- JavaClass clazz = classes[i]; ++ for (JavaClass clazz: classes) { + if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) { + processEventProducerInterface(clazz); + eventProducerFound = true; +@@ -104,9 +91,8 @@ class EventProducerCollector { + } + + private boolean implementsInterface(JavaClass clazz, String intf) { +- JavaClass[] classes = clazz.getImplementedInterfaces(); +- for (int i = 0, c = classes.length; i < c; i++) { +- JavaClass cl = classes[i]; ++ List classes = clazz.getImplementedInterfaces(); ++ for (JavaClass cl: classes) { + if (cl.getFullyQualifiedName().equals(intf)) { + return true; + } +@@ -123,9 +109,8 @@ class EventProducerCollector { + protected void processEventProducerInterface(JavaClass clazz) + throws EventConventionException, ClassNotFoundException { + EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName()); +- JavaMethod[] methods = clazz.getMethods(true); +- for (int i = 0, c = methods.length; i < c; i++) { +- JavaMethod method = methods[i]; ++ List methods = clazz.getMethods(true); ++ for (JavaMethod method: methods) { + EventMethodModel methodMeta = createMethodModel(method); + prodMeta.addMethod(methodMeta); + } +@@ -138,18 +123,18 @@ class EventProducerCollector { + throws EventConventionException, ClassNotFoundException { + JavaClass clazz = method.getParentClass(); + //Check EventProducer conventions +- if (!method.getReturnType().isVoid()) { ++ if (!method.getReturns().isVoid()) { + throw new EventConventionException("All methods of interface " + + clazz.getFullyQualifiedName() + " must have return type 'void'!"); + } + String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature(); +- JavaParameter[] params = method.getParameters(); +- if (params.length < 1) { ++ List params = method.getParameters(); ++ if (params.size() < 1) { + throw new EventConventionException("The method " + methodSig + + " must have at least one parameter: 'Object source'!"); + } +- Type firstType = params[0].getType(); +- if (firstType.isPrimitive() || !"source".equals(params[0].getName())) { ++ JavaClass firstType = params.get(0).getJavaClass(); ++ if (firstType.isPrimitive() || !"source".equals(params.get(0).getName())) { + throw new EventConventionException("The first parameter of the method " + methodSig + + " must be: 'Object source'!"); + } +@@ -164,12 +149,12 @@ class EventProducerCollector { + } + EventMethodModel methodMeta = new EventMethodModel( + method.getName(), severity); +- if (params.length > 1) { +- for (int j = 1, cj = params.length; j < cj; j++) { +- JavaParameter p = params[j]; ++ if (params.size() > 1) { ++ for (int j = 1, cj = params.size(); j < cj; j++) { ++ JavaParameter p = params.get(j); + Class type; +- JavaClass pClass = p.getType().getJavaClass(); +- if (p.getType().isPrimitive()) { ++ JavaClass pClass = p.getJavaClass(); ++ if (pClass.isPrimitive()) { + type = PRIMITIVE_MAP.get(pClass.getName()); + if (type == null) { + throw new UnsupportedOperationException( +@@ -182,10 +167,10 @@ class EventProducerCollector { + methodMeta.addParameter(type, p.getName()); + } + } +- Type[] exceptions = method.getExceptions(); +- if (exceptions != null && exceptions.length > 0) { ++ List exceptions = method.getExceptions(); ++ if (exceptions != null && exceptions.size() > 0) { + //We only use the first declared exception because that is always thrown +- JavaClass cl = exceptions[0].getJavaClass(); ++ JavaClass cl = exceptions.get(0); + methodMeta.setExceptionClass(cl.getFullyQualifiedName()); + methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments + } +-- +2.1.0 + diff --git a/fop.spec b/fop.spec index 8373e5f..3fd8124 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -15,6 +15,8 @@ Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{ Source4: http://www.apache.org/licenses/LICENSE-1.1.txt Patch0: %{name}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch +Patch2: 0001-Port-to-xmlgraphics-commons-2.0.patch +Patch3: 0002-Port-to-QDox-2.0.patch BuildArch: noarch @@ -59,6 +61,8 @@ Javadoc for %{name}. %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -113,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Mar 17 2015 Michael Simacek - 1.1-9 +- Port to current QDox and xmlgraphics-commons + * Mon Jun 16 2014 Michal Srb - 1.1-8 - Fix FTBFS From e14cd08e3ffb74161b080d717a249e9fa210f0f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:56 +0200 Subject: [PATCH 15/73] Disable javadoc doclint --- 0001-Port-to-xmlgraphics-commons-2.0.patch | 4 ++-- 0002-Port-to-QDox-2.0.patch | 4 ++-- 0003-Disable-javadoc-doclint.patch | 24 ++++++++++++++++++++++ fop.spec | 7 ++++++- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 0003-Disable-javadoc-doclint.patch diff --git a/0001-Port-to-xmlgraphics-commons-2.0.patch b/0001-Port-to-xmlgraphics-commons-2.0.patch index 7691728..c4818ea 100644 --- a/0001-Port-to-xmlgraphics-commons-2.0.patch +++ b/0001-Port-to-xmlgraphics-commons-2.0.patch @@ -1,7 +1,7 @@ -From a73c52951332b8399dd74e3482d283e0394bf741 Mon Sep 17 00:00:00 2001 +From d346bc582f35a1dce998543d2540c226f3238389 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Mar 2015 16:20:10 +0100 -Subject: [PATCH 1/2] Port to xmlgraphics-commons-2.0 +Subject: [PATCH 1/3] Port to xmlgraphics-commons-2.0 --- src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java | 2 +- diff --git a/0002-Port-to-QDox-2.0.patch b/0002-Port-to-QDox-2.0.patch index a82efd7..8b8ec36 100644 --- a/0002-Port-to-QDox-2.0.patch +++ b/0002-Port-to-QDox-2.0.patch @@ -1,7 +1,7 @@ -From 4b72b9270d7362741548e1aa21a1ee868f0be882 Mon Sep 17 00:00:00 2001 +From 7c14c67785aebe7a3bc7712dc7dde19a790a0034 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 2/2] Port to QDox 2.0 +Subject: [PATCH 2/3] Port to QDox 2.0 --- .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch new file mode 100644 index 0000000..410cc15 --- /dev/null +++ b/0003-Disable-javadoc-doclint.patch @@ -0,0 +1,24 @@ +From 7d404f47740cf679bf2e94a1cc03e78c5692df6c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 14 May 2015 06:26:09 +0200 +Subject: [PATCH 3/3] Disable javadoc doclint + +--- + build.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build.xml b/build.xml +index 7c05049..d15b403 100644 +--- a/build.xml ++++ b/build.xml +@@ -951,6 +951,7 @@ NOTE: + bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." + overview="${src.dir}/java/org/apache/fop/overview.html" + maxmemory="256M"> ++ +
+
+ +-- +2.1.0 + diff --git a/fop.spec b/fop.spec index 3fd8124..f20c5cf 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -17,6 +17,7 @@ Patch0: %{name}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch Patch2: 0001-Port-to-xmlgraphics-commons-2.0.patch Patch3: 0002-Port-to-QDox-2.0.patch +Patch4: 0003-Disable-javadoc-doclint.patch BuildArch: noarch @@ -63,6 +64,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -117,6 +119,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu May 14 2015 Mikolaj Izdebski - 1.1-10 +- Disable javadoc doclint + * Tue Mar 17 2015 Michael Simacek - 1.1-9 - Port to current QDox and xmlgraphics-commons From 389e48b109d22f08e4bae1d14f78525547744131 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 06:34:34 +0000 Subject: [PATCH 16/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index f20c5cf..4cbda22 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -119,6 +119,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 14 2015 Mikolaj Izdebski - 1.1-10 - Disable javadoc doclint From 2dd5bb12633f652971404263fef4d3bfeec3935f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 17:39:47 +0200 Subject: [PATCH 17/73] Update to upstream version 2.0 --- .gitignore | 2 + 0001-Main.patch | 29 ++++++ 0001-Port-to-xmlgraphics-commons-2.0.patch | 25 ----- ...cc-color-profile-from-colord-package.patch | 21 ++--- 0003-Disable-javadoc-doclint.patch | 8 +- ...x-2.0.patch => 0004-Port-to-QDox-2.0.patch | 4 +- clean-tarball.sh | 1 - fop-main.patch | 15 --- fop.spec | 92 ++++++++++--------- sources | 3 +- 10 files changed, 97 insertions(+), 103 deletions(-) create mode 100644 0001-Main.patch delete mode 100644 0001-Port-to-xmlgraphics-commons-2.0.patch rename fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch => 0002-Use-sRGB.icc-color-profile-from-colord-package.patch (77%) rename 0002-Port-to-QDox-2.0.patch => 0004-Port-to-QDox-2.0.patch (98%) delete mode 100644 fop-main.patch diff --git a/.gitignore b/.gitignore index 9ab3c16..cbd8a15 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ fop-1.0-src.tar.gz /fop-1.1-src.tar.gz /fop-1.1-clean.tar.gz /LICENSE-1.1.txt +/fop-2.0-clean.tar.gz +/fop-2.0.pom diff --git a/0001-Main.patch b/0001-Main.patch new file mode 100644 index 0000000..bf09bc7 --- /dev/null +++ b/0001-Main.patch @@ -0,0 +1,29 @@ +From 040c088781b565273ccc085b597bab2e7b99c782 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:54:43 +0200 +Subject: [PATCH 1/4] Main + +--- + src/java/org/apache/fop/cli/Main.java | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/java/org/apache/fop/cli/Main.java b/src/java/org/apache/fop/cli/Main.java +index d56b2ca..35e76cc 100644 +--- a/src/java/org/apache/fop/cli/Main.java ++++ b/src/java/org/apache/fop/cli/Main.java +@@ -213,11 +213,7 @@ public final class Main { + * @param args the command line parameters + */ + public static void main(String[] args) { +- if (checkDependencies()) { +- startFOP(args); +- } else { +- startFOPWithDynamicClasspath(args); +- } ++ startFOP(args); + } + + } +-- +2.1.0 + diff --git a/0001-Port-to-xmlgraphics-commons-2.0.patch b/0001-Port-to-xmlgraphics-commons-2.0.patch deleted file mode 100644 index c4818ea..0000000 --- a/0001-Port-to-xmlgraphics-commons-2.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d346bc582f35a1dce998543d2540c226f3238389 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 16 Mar 2015 16:20:10 +0100 -Subject: [PATCH 1/3] Port to xmlgraphics-commons-2.0 - ---- - src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -index 1f49de7..81608ed 100644 ---- a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -+++ b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java -@@ -353,7 +353,7 @@ class PDFRenderingUtil implements PDFConfigurationConstants { - 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); -+ fopXMP.mergeInto(docXMP, java.util.Collections.emptyList()); - XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); - //Metadata was changed so update metadata date - xmpBasic.setMetadataDate(new java.util.Date()); --- -2.1.0 - diff --git a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch similarity index 77% rename from fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch rename to 0002-Use-sRGB.icc-color-profile-from-colord-package.patch index a40018a..18ab448 100644 --- a/fop-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -1,7 +1,7 @@ -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 colord package +From bddb924b5390c98dc012e0bc15fa6bddb53a64aa Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:56:49 +0200 +Subject: [PATCH 2/4] Use sRGB.icc color profile from colord package It's a replacement for non-free color profile shipped with fop --- @@ -9,21 +9,20 @@ It's a replacement for non-free color profile shipped with fop 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 +index 89a2c06..f0867a9 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; - +@@ -22,7 +22,9 @@ 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.FileNotFoundException; import java.io.InputStream; +import java.io.FileInputStream; + import java.util.Set; import org.apache.commons.io.IOUtils; - -@@ -137,7 +139,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { +@@ -138,7 +140,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { ICC_Profile profile; PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); @@ -38,5 +37,5 @@ index 60fea88..e041344 100644 try { profile = ColorProfileUtil.getICC_Profile(in); -- -1.8.1.4 +2.1.0 diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 410cc15..9a9b2ed 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,17 +1,17 @@ -From 7d404f47740cf679bf2e94a1cc03e78c5692df6c Mon Sep 17 00:00:00 2001 +From 1af3481114fda16bc6104618ac19b98577b69460 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/3] Disable javadoc doclint +Subject: [PATCH 3/4] Disable javadoc doclint --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 7c05049..d15b403 100644 +index 427aa4c..4f212f0 100644 --- a/build.xml +++ b/build.xml -@@ -951,6 +951,7 @@ NOTE: +@@ -964,6 +964,7 @@ NOTE: bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." overview="${src.dir}/java/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0002-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch similarity index 98% rename from 0002-Port-to-QDox-2.0.patch rename to 0004-Port-to-QDox-2.0.patch index 8b8ec36..ba6d04c 100644 --- a/0002-Port-to-QDox-2.0.patch +++ b/0004-Port-to-QDox-2.0.patch @@ -1,7 +1,7 @@ -From 7c14c67785aebe7a3bc7712dc7dde19a790a0034 Mon Sep 17 00:00:00 2001 +From 3edb7de2cdd7dab48947882ae3340b0c3a0a9f87 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 2/3] Port to QDox 2.0 +Subject: [PATCH 4/4] Port to QDox 2.0 --- .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- diff --git a/clean-tarball.sh b/clean-tarball.sh index abdde65..0360298 100755 --- a/clean-tarball.sh +++ b/clean-tarball.sh @@ -27,4 +27,3 @@ tar xvf ${NAME}-${VERSION}-src.tar.gz tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} rm -Rf ${NAME}-${VERSION}.tar.gz - diff --git a/fop-main.patch b/fop-main.patch deleted file mode 100644 index 1726940..0000000 --- a/fop-main.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ../../orig/fop-0.94/src/java/org/apache/fop/cli/Main.java 2007-08-18 13:56:46.000000000 -0400 -+++ src/java/org/apache/fop/cli/Main.java 2007-09-18 09:19:53.000000000 -0400 -@@ -193,11 +193,7 @@ - * @param args the command line parameters - */ - public static void main(String[] args) { -- if (checkDependencies()) { -- startFOP(args); -- } else { -- startFOPWithDynamicClasspath(args); -- } -+ startFOP(args); - } - - } diff --git a/fop.spec b/fop.spec index 4cbda22..ace14fa 100644 --- a/fop.spec +++ b/fop.spec @@ -1,48 +1,49 @@ -Name: fop -Summary: XSL-driven print formatter -Version: 1.1 -Release: 11%{?dist} +Name: fop +Summary: XSL-driven print formatter +Version: 2.0 +Release: 1%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 -License: ASL 2.0 and ASL 1.1 -URL: http://xmlgraphics.apache.org/fop +License: ASL 2.0 and ASL 1.1 +URL: http://xmlgraphics.apache.org/fop # ./clean-tarball %%{version} -Source0: %{name}-%{version}-clean.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 -Source4: http://www.apache.org/licenses/LICENSE-1.1.txt -Patch0: %{name}-main.patch -Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch -Patch2: 0001-Port-to-xmlgraphics-commons-2.0.patch -Patch3: 0002-Port-to-QDox-2.0.patch -Patch4: 0003-Disable-javadoc-doclint.patch +Source0: %{name}-%{version}-clean.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 +Source4: http://www.apache.org/licenses/LICENSE-1.1.txt +Patch0: 0001-Main.patch +Patch1: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch +Patch2: 0003-Disable-javadoc-doclint.patch +Patch3: 0004-Port-to-QDox-2.0.patch -BuildArch: noarch +BuildArch: noarch -Requires: xmlgraphics-commons >= 1.5 -Requires: avalon-framework >= 4.1.4 -Requires: batik >= 1.7 -Requires: xalan-j2 >= 2.7.0 -Requires: xml-commons-apis >= 1.3.04 -Requires: jakarta-commons-httpclient -Requires: apache-commons-io >= 1.2 -Requires: apache-commons-logging >= 1.0.4 -Requires: java +Requires: xmlgraphics-commons >= 1.5 +Requires: avalon-framework >= 4.1.4 +Requires: batik >= 1.7 +Requires: xalan-j2 >= 2.7.0 +Requires: xml-commons-apis >= 1.3.04 +Requires: jakarta-commons-httpclient +Requires: apache-commons-io >= 1.2 +Requires: apache-commons-logging >= 1.0.4 +Requires: fontbox +Requires: java -BuildRequires: ant -BuildRequires: java-devel -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-io -BuildRequires: avalon-framework -BuildRequires: xmlgraphics-commons >= 1.5 -BuildRequires: batik -BuildRequires: servlet -BuildRequires: qdox -BuildRequires: xmlunit -BuildRequires: zip -BuildRequires: junit +BuildRequires: ant +BuildRequires: javapackages-local +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-io +BuildRequires: avalon-framework +BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: batik +BuildRequires: servlet +BuildRequires: qdox +BuildRequires: xmlunit +BuildRequires: zip +BuildRequires: junit +BuildRequires: fontbox %description FOP is the world's first print formatter driven by XSL formatting @@ -53,29 +54,29 @@ Xalan) or can be passed in memory as a DOM Document or (in the case of XT) SAX events. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. %prep %setup -q -%patch0 -p0 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 -sed -i -e "s|1.4|1.5|g" build.xml - #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 ln -s %{_javadir}/qdox.jar lib/build/qdox.jar %build #qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 -export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework-api avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext objectweb-asm/asm-all xmlunit) +export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ + fontbox xmlgraphics-commons batik-all avalon-framework-api \ + avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis \ + xml-commons-apis-ext objectweb-asm/asm-all xmlunit) ant jar-main transcoder-pkg javadocs %install @@ -119,6 +120,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Jul 14 2015 Michael Simacek - 2.0-1 +- Update to upstream version 2.0 + * Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 1887526..0e607c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -0eaef1991f1dbc1fcfb238c918cecbf3 fop-1.1-clean.tar.gz +be48a90731a82b8e752a6460f544290d fop-2.0-clean.tar.gz +3e6fd7f8ae8da63b6ff8f13bf09f0ae6 fop-2.0.pom 92afa66b413bb09a3bbd590091a836f5 LICENSE-1.1.txt From 6b693cacc379c7cfdb9c77928c2a2b12bd9d1c9a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 7 Aug 2015 13:05:25 +0200 Subject: [PATCH 18/73] Add fix for FOP-2461 (rhbz#1251173) --- 0001-Main.patch | 2 +- ...cc-color-profile-from-colord-package.patch | 2 +- 0003-Disable-javadoc-doclint.patch | 2 +- 0004-Port-to-QDox-2.0.patch | 2 +- 0005-NPE-FOP-2461.patch | 36 +++++++++++++++++++ fop.spec | 8 ++++- 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 0005-NPE-FOP-2461.patch diff --git a/0001-Main.patch b/0001-Main.patch index bf09bc7..767cef9 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -1,7 +1,7 @@ From 040c088781b565273ccc085b597bab2e7b99c782 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:54:43 +0200 -Subject: [PATCH 1/4] Main +Subject: [PATCH 1/5] Main --- src/java/org/apache/fop/cli/Main.java | 6 +----- diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index 18ab448..21082a8 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -1,7 +1,7 @@ From bddb924b5390c98dc012e0bc15fa6bddb53a64aa Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:56:49 +0200 -Subject: [PATCH 2/4] Use sRGB.icc color profile from colord package +Subject: [PATCH 2/5] Use sRGB.icc color profile from colord package It's a replacement for non-free color profile shipped with fop --- diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 9a9b2ed..496b426 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,7 +1,7 @@ From 1af3481114fda16bc6104618ac19b98577b69460 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/4] Disable javadoc doclint +Subject: [PATCH 3/5] Disable javadoc doclint --- build.xml | 1 + diff --git a/0004-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch index ba6d04c..93c1527 100644 --- a/0004-Port-to-QDox-2.0.patch +++ b/0004-Port-to-QDox-2.0.patch @@ -1,7 +1,7 @@ From 3edb7de2cdd7dab48947882ae3340b0c3a0a9f87 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 4/4] Port to QDox 2.0 +Subject: [PATCH 4/5] Port to QDox 2.0 --- .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- diff --git a/0005-NPE-FOP-2461.patch b/0005-NPE-FOP-2461.patch new file mode 100644 index 0000000..ef464cb --- /dev/null +++ b/0005-NPE-FOP-2461.patch @@ -0,0 +1,36 @@ +From 616945aa41c7ef4885d29481df072f760b18ddb5 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 7 Aug 2015 13:03:32 +0200 +Subject: [PATCH 5/5] NPE-FOP-2461 + +--- + src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +index 9ba1bce..b42c635 100644 +--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java ++++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +@@ -393,7 +393,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage + int breakClass = EN_AUTO; + KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0]) + : null; +- Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null; ++ Position originalLabelPosition = ++ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null; + if (endEl instanceof KnuthPenalty) { + additionalPenaltyHeight = endEl.getWidth(); + stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math +@@ -402,7 +403,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage + ((KnuthPenalty) endEl).getBreakClass()); + } + endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null; +- Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null; ++ Position originalBodyPosition = ++ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null; + if (endEl instanceof KnuthPenalty) { + additionalPenaltyHeight = Math.max( + additionalPenaltyHeight, endEl.getWidth()); +-- +2.1.0 + diff --git a/fop.spec b/fop.spec index ace14fa..0ae0156 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -17,6 +17,8 @@ Patch0: 0001-Main.patch Patch1: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch2: 0003-Disable-javadoc-doclint.patch Patch3: 0004-Port-to-QDox-2.0.patch +# https://issues.apache.org/jira/browse/FOP-2461 +Patch4: 0005-NPE-FOP-2461.patch BuildArch: noarch @@ -65,6 +67,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -120,6 +123,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Aug 07 2015 Michael Simacek - 2.0-2 +- Add fix for FOP-2461 (rhbz#1251173) + * Tue Jul 14 2015 Michael Simacek - 2.0-1 - Update to upstream version 2.0 From 0c23b90d6e269254ca56b9577ae47e0e4aa96c00 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:41:25 +0000 Subject: [PATCH 19/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 0ae0156..640640e 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -123,6 +123,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Aug 07 2015 Michael Simacek - 2.0-2 - Add fix for FOP-2461 (rhbz#1251173) From f06e69bdd0e104a5eb5199102e438c6209f4a44c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 13:11:20 +0100 Subject: [PATCH 20/73] Fix FTBFS --- 0001-Main.patch | 6 ++--- ...cc-color-profile-from-colord-package.patch | 6 ++--- 0003-Disable-javadoc-doclint.patch | 6 ++--- 0004-Port-to-QDox-2.0.patch | 21 +++++++++------- 0005-NPE-FOP-2461.patch | 6 ++--- 0006-Allow-javascript-in-javadoc.patch | 24 +++++++++++++++++++ fop.spec | 7 +++++- 7 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 0006-Allow-javascript-in-javadoc.patch diff --git a/0001-Main.patch b/0001-Main.patch index 767cef9..a40f673 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -1,7 +1,7 @@ -From 040c088781b565273ccc085b597bab2e7b99c782 Mon Sep 17 00:00:00 2001 +From 2a18cf0399af805cc7e1fdbeb98180b08d9bd8f9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:54:43 +0200 -Subject: [PATCH 1/5] Main +Subject: [PATCH 1/6] Main --- src/java/org/apache/fop/cli/Main.java | 6 +----- @@ -25,5 +25,5 @@ index d56b2ca..35e76cc 100644 } -- -2.1.0 +2.9.3 diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index 21082a8..2e54859 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -1,7 +1,7 @@ -From bddb924b5390c98dc012e0bc15fa6bddb53a64aa Mon Sep 17 00:00:00 2001 +From 4711c34226d25055e5ba7975f7d8c0abdd2e74ed Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:56:49 +0200 -Subject: [PATCH 2/5] Use sRGB.icc color profile from colord package +Subject: [PATCH 2/6] Use sRGB.icc color profile from colord package It's a replacement for non-free color profile shipped with fop --- @@ -37,5 +37,5 @@ index 89a2c06..f0867a9 100644 try { profile = ColorProfileUtil.getICC_Profile(in); -- -2.1.0 +2.9.3 diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 496b426..6da3f52 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,7 +1,7 @@ -From 1af3481114fda16bc6104618ac19b98577b69460 Mon Sep 17 00:00:00 2001 +From 92072ed441866211e71dfed515b2c85df8e704a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/5] Disable javadoc doclint +Subject: [PATCH 3/6] Disable javadoc doclint --- build.xml | 1 + @@ -20,5 +20,5 @@ index 427aa4c..4f212f0 100644
-- -2.1.0 +2.9.3 diff --git a/0004-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch index 93c1527..555b68b 100644 --- a/0004-Port-to-QDox-2.0.patch +++ b/0004-Port-to-QDox-2.0.patch @@ -1,14 +1,14 @@ -From 3edb7de2cdd7dab48947882ae3340b0c3a0a9f87 Mon Sep 17 00:00:00 2001 +From e424bad757e50ffa6f819e14e9347c69a7337adc Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 4/5] Port to QDox 2.0 +Subject: [PATCH 4/6] Port to QDox 2.0 --- - .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- - 1 file changed, 22 insertions(+), 37 deletions(-) + .../apache/fop/tools/EventProducerCollector.java | 61 ++++++++-------------- + 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -index c6674ba..e39bf50 100644 +index c6674ba..620ecc4 100644 --- a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java @@ -21,6 +21,7 @@ package org.apache.fop.tools; @@ -81,7 +81,7 @@ index c6674ba..e39bf50 100644 - JavaClass[] classes = clazz.getImplementedInterfaces(); - for (int i = 0, c = classes.length; i < c; i++) { - JavaClass cl = classes[i]; -+ List classes = clazz.getImplementedInterfaces(); ++ List classes = clazz.getInterfaces(); + for (JavaClass cl: classes) { if (cl.getFullyQualifiedName().equals(intf)) { return true; @@ -98,9 +98,12 @@ index c6674ba..e39bf50 100644 EventMethodModel methodMeta = createMethodModel(method); prodMeta.addMethod(methodMeta); } -@@ -138,18 +123,18 @@ class EventProducerCollector { +@@ -136,20 +121,20 @@ class EventProducerCollector { + + private EventMethodModel createMethodModel(JavaMethod method) throws EventConventionException, ClassNotFoundException { - JavaClass clazz = method.getParentClass(); +- JavaClass clazz = method.getParentClass(); ++ JavaClass clazz = method.getDeclaringClass(); //Check EventProducer conventions - if (!method.getReturnType().isVoid()) { + if (!method.getReturns().isVoid()) { @@ -155,5 +158,5 @@ index c6674ba..e39bf50 100644 methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments } -- -2.1.0 +2.9.3 diff --git a/0005-NPE-FOP-2461.patch b/0005-NPE-FOP-2461.patch index ef464cb..330fe2f 100644 --- a/0005-NPE-FOP-2461.patch +++ b/0005-NPE-FOP-2461.patch @@ -1,7 +1,7 @@ -From 616945aa41c7ef4885d29481df072f760b18ddb5 Mon Sep 17 00:00:00 2001 +From 933f4f76b3af4bd8dc109dc375db84c44ea167f9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 7 Aug 2015 13:03:32 +0200 -Subject: [PATCH 5/5] NPE-FOP-2461 +Subject: [PATCH 5/6] NPE-FOP-2461 --- src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 6 ++++-- @@ -32,5 +32,5 @@ index 9ba1bce..b42c635 100644 additionalPenaltyHeight = Math.max( additionalPenaltyHeight, endEl.getWidth()); -- -2.1.0 +2.9.3 diff --git a/0006-Allow-javascript-in-javadoc.patch b/0006-Allow-javascript-in-javadoc.patch new file mode 100644 index 0000000..f1ca05b --- /dev/null +++ b/0006-Allow-javascript-in-javadoc.patch @@ -0,0 +1,24 @@ +From 2484113b0226421a357a82b9cc021725b73e8251 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 1 Feb 2017 13:10:03 +0100 +Subject: [PATCH 6/6] Allow javascript in javadoc + +--- + build.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build.xml b/build.xml +index 4f212f0..d2734e1 100644 +--- a/build.xml ++++ b/build.xml +@@ -965,6 +965,7 @@ NOTE: + overview="${src.dir}/java/org/apache/fop/overview.html" + maxmemory="256M"> + ++ +
+
+ +-- +2.9.3 + diff --git a/fop.spec b/fop.spec index 640640e..27937d7 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -19,6 +19,7 @@ Patch2: 0003-Disable-javadoc-doclint.patch Patch3: 0004-Port-to-QDox-2.0.patch # https://issues.apache.org/jira/browse/FOP-2461 Patch4: 0005-NPE-FOP-2461.patch +Patch5: 0006-Allow-javascript-in-javadoc.patch BuildArch: noarch @@ -68,6 +69,7 @@ Javadoc for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -123,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Feb 01 2017 Michael Simacek - 2.0-4 +- Fix FTBFS + * Wed Feb 03 2016 Fedora Release Engineering - 2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 9161f383d114417fb20191c3969b220b7ebca03e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:56:10 +0000 Subject: [PATCH 21/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 27937d7..4165627 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 4%{?dist} +Release: 5%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Michael Simacek - 2.0-4 - Fix FTBFS From 4df9b7b6cda808a7bf3ec6a8ecf3a0d738033511 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:38:42 +0000 Subject: [PATCH 22/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 4165627..2e95959 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 5%{?dist} +Release: 6%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e1b1b6950506bbf092b9eeb0606e622c01fa5f88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 12 Sep 2017 08:20:41 +0200 Subject: [PATCH 23/73] Add fontbox to classpath Resolves: rhbz#1413340 --- fop.script | 2 +- fop.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fop.script b/fop.script index 6aa64ff..64e2bf7 100644 --- a/fop.script +++ b/fop.script @@ -27,7 +27,7 @@ MAIN_CLASS=org.apache.fop.cli.Main set_jvm set_classpath commons-io batik-all avalon-framework-api \ avalon-framework-impl xmlgraphics-commons xml-commons-apis-ext \ - commons-logging fop + commons-logging fontbox fop set_flags $BASE_FLAGS set_options $BASE_OPTIONS diff --git a/fop.spec b/fop.spec index 2e95959..810de7a 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 6%{?dist} +Release: 7%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -125,6 +125,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Sep 12 2017 Mikolaj Izdebski - 2.0-7 +- Add fontbox to classpath +- Resolves: rhbz#1413340 + * Wed Jul 26 2017 Fedora Release Engineering - 2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6ed788ee343cc4135d8356d0f0dd30bc34cf622a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Sep 2017 18:16:26 +0200 Subject: [PATCH 24/73] Elimitate race condition when injecting JAR manifest Resolves: rhbz#1495235 --- fop.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fop.spec b/fop.spec index 810de7a..e5c5029 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 7%{?dist} +Release: 8%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -44,7 +44,6 @@ BuildRequires: batik BuildRequires: servlet BuildRequires: qdox BuildRequires: xmlunit -BuildRequires: zip BuildRequires: junit BuildRequires: fontbox @@ -85,11 +84,8 @@ export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ ant jar-main transcoder-pkg javadocs %install -# inject OSGi manifests -install -d -m 755 META-INF -install -p -m 644 %{SOURCE2} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u build/%{name}.jar META-INF/MANIFEST.MF +# inject OSGi manifest +jar ufm build/%{name}.jar %{SOURCE2} # jars install -d -m 755 %{buildroot}%{_javadir} @@ -125,6 +121,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Mon Sep 25 2017 Mikolaj Izdebski - 2.0-8 +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495235 + * Tue Sep 12 2017 Mikolaj Izdebski - 2.0-7 - Add fontbox to classpath - Resolves: rhbz#1413340 From 78b853efcb0fc1bb5a68070d5469c03e7b555adb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 09:59:45 +0000 Subject: [PATCH 25/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index e5c5029..77924cc 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 8%{?dist} +Release: 9%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -121,6 +121,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Sep 25 2017 Mikolaj Izdebski - 2.0-8 - Elimitate race condition when injecting JAR manifest - Resolves: rhbz#1495235 From a80773add0df3667d1dc992b2f0f3729e7e4363e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 17 May 2018 20:17:08 +0300 Subject: [PATCH 26/73] Fop ver. 2.2 Signed-off-by: Peter Lemenkov --- 0001-Main.patch | 17 ++-- ...cc-color-profile-from-colord-package.patch | 20 ++--- 0003-Disable-javadoc-doclint.patch | 21 ++--- 0004-Port-to-QDox-2.0.patch | 45 ++++------ 0005-Allow-javascript-in-javadoc.patch | 17 ++++ 0005-NPE-FOP-2461.patch | 36 -------- 0006-Allow-javascript-in-javadoc.patch | 24 ------ ...-Non-free-colour-profile-was-removed.patch | 22 +++++ fop.spec | 83 +++++++++---------- 9 files changed, 112 insertions(+), 173 deletions(-) create mode 100644 0005-Allow-javascript-in-javadoc.patch delete mode 100644 0005-NPE-FOP-2461.patch delete mode 100644 0006-Allow-javascript-in-javadoc.patch create mode 100644 0006-Non-free-colour-profile-was-removed.patch diff --git a/0001-Main.patch b/0001-Main.patch index a40f673..9ff5d31 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -1,16 +1,12 @@ -From 2a18cf0399af805cc7e1fdbeb98180b08d9bd8f9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:54:43 +0200 -Subject: [PATCH 1/6] Main +Subject: [PATCH] Main ---- - src/java/org/apache/fop/cli/Main.java | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/src/java/org/apache/fop/cli/Main.java b/src/java/org/apache/fop/cli/Main.java -index d56b2ca..35e76cc 100644 ---- a/src/java/org/apache/fop/cli/Main.java -+++ b/src/java/org/apache/fop/cli/Main.java +diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java +index e082265f1..143a57cb6 100644 +--- a/fop-core/src/main/java/org/apache/fop/cli/Main.java ++++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java @@ -213,11 +213,7 @@ public final class Main { * @param args the command line parameters */ @@ -24,6 +20,3 @@ index d56b2ca..35e76cc 100644 } } --- -2.9.3 - diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index 2e54859..fa3157b 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -1,17 +1,12 @@ -From 4711c34226d25055e5ba7975f7d8c0abdd2e74ed Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:56:49 +0200 -Subject: [PATCH 2/6] Use sRGB.icc color profile from colord package +Subject: [PATCH] Use sRGB.icc color profile from colord 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 89a2c06..f0867a9 100644 ---- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -+++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +index 704898def..1ce14cb4e 100644 +--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java @@ -22,7 +22,9 @@ package org.apache.fop.pdf; import java.awt.color.ColorSpace; import java.awt.color.ICC_Profile; @@ -26,7 +21,7 @@ index 89a2c06..f0867a9 100644 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 = PDFDocument.class.getResourceAsStream("sRGB.icc"); + InputStream in; + try { + in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); @@ -36,6 +31,3 @@ index 89a2c06..f0867a9 100644 if (in != null) { try { profile = ColorProfileUtil.getICC_Profile(in); --- -2.9.3 - diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 6da3f52..f61daa7 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,24 +1,17 @@ -From 92072ed441866211e71dfed515b2c85df8e704a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/6] Disable javadoc doclint +Subject: [PATCH] Disable javadoc doclint ---- - build.xml | 1 + - 1 file changed, 1 insertion(+) -diff --git a/build.xml b/build.xml -index 427aa4c..4f212f0 100644 ---- a/build.xml -+++ b/build.xml -@@ -964,6 +964,7 @@ NOTE: +diff --git a/fop/build.xml b/fop/build.xml +index 3110bf00d..a4a921e1c 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -1008,6 +1008,7 @@ NOTE: bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." - overview="${src.dir}/java/org/apache/fop/overview.html" + overview="${src.java.dir}/org/apache/fop/overview.html" maxmemory="256M"> +
--- -2.9.3 - diff --git a/0004-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch index 555b68b..c395e39 100644 --- a/0004-Port-to-QDox-2.0.patch +++ b/0004-Port-to-QDox-2.0.patch @@ -1,16 +1,12 @@ -From e424bad757e50ffa6f819e14e9347c69a7337adc Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 4/6] Port to QDox 2.0 +Subject: [PATCH] Port to QDox 2.0 ---- - .../apache/fop/tools/EventProducerCollector.java | 61 ++++++++-------------- - 1 file changed, 23 insertions(+), 38 deletions(-) -diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -index c6674ba..620ecc4 100644 ---- a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java -+++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java +diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +index 2351fc870..64cd7edf0 100644 +--- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java ++++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java @@ -21,6 +21,7 @@ package org.apache.fop.tools; import java.io.File; @@ -58,7 +54,7 @@ index c6674ba..620ecc4 100644 } /** -@@ -89,12 +77,11 @@ class EventProducerCollector { +@@ -89,9 +77,9 @@ class EventProducerCollector { */ public boolean scanFile(File src) throws IOException, EventConventionException, ClassNotFoundException { @@ -68,37 +64,27 @@ index c6674ba..620ecc4 100644 - JavaClass[] classes = builder.getClasses(); + Collection classes = builder.getClasses(); boolean eventProducerFound = false; -- for (int i = 0, c = classes.length; i < c; i++) { -- JavaClass clazz = classes[i]; -+ for (JavaClass clazz: classes) { + for (JavaClass clazz : classes) { if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) { - processEventProducerInterface(clazz); - eventProducerFound = true; -@@ -104,9 +91,8 @@ class EventProducerCollector { +@@ -103,7 +91,7 @@ class EventProducerCollector { } private boolean implementsInterface(JavaClass clazz, String intf) { - JavaClass[] classes = clazz.getImplementedInterfaces(); -- for (int i = 0, c = classes.length; i < c; i++) { -- JavaClass cl = classes[i]; + List classes = clazz.getInterfaces(); -+ for (JavaClass cl: classes) { + for (JavaClass cl : classes) { if (cl.getFullyQualifiedName().equals(intf)) { return true; - } -@@ -123,9 +109,8 @@ class EventProducerCollector { +@@ -121,7 +109,7 @@ class EventProducerCollector { protected void processEventProducerInterface(JavaClass clazz) throws EventConventionException, ClassNotFoundException { EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName()); - JavaMethod[] methods = clazz.getMethods(true); -- for (int i = 0, c = methods.length; i < c; i++) { -- JavaMethod method = methods[i]; + List methods = clazz.getMethods(true); -+ for (JavaMethod method: methods) { + for (JavaMethod method : methods) { EventMethodModel methodMeta = createMethodModel(method); prodMeta.addMethod(methodMeta); - } -@@ -136,20 +121,20 @@ class EventProducerCollector { +@@ -133,20 +121,20 @@ class EventProducerCollector { private EventMethodModel createMethodModel(JavaMethod method) throws EventConventionException, ClassNotFoundException { @@ -125,7 +111,7 @@ index c6674ba..620ecc4 100644 throw new EventConventionException("The first parameter of the method " + methodSig + " must be: 'Object source'!"); } -@@ -164,12 +149,12 @@ class EventProducerCollector { +@@ -161,12 +149,12 @@ class EventProducerCollector { } EventMethodModel methodMeta = new EventMethodModel( method.getName(), severity); @@ -143,7 +129,7 @@ index c6674ba..620ecc4 100644 type = PRIMITIVE_MAP.get(pClass.getName()); if (type == null) { throw new UnsupportedOperationException( -@@ -182,10 +167,10 @@ class EventProducerCollector { +@@ -179,10 +167,10 @@ class EventProducerCollector { methodMeta.addParameter(type, p.getName()); } } @@ -157,6 +143,3 @@ index c6674ba..620ecc4 100644 methodMeta.setExceptionClass(cl.getFullyQualifiedName()); methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments } --- -2.9.3 - diff --git a/0005-Allow-javascript-in-javadoc.patch b/0005-Allow-javascript-in-javadoc.patch new file mode 100644 index 0000000..f9e3260 --- /dev/null +++ b/0005-Allow-javascript-in-javadoc.patch @@ -0,0 +1,17 @@ +From: Michael Simacek +Date: Wed, 1 Feb 2017 13:10:03 +0100 +Subject: [PATCH] Allow javascript in javadoc + + +diff --git a/fop/build.xml b/fop/build.xml +index a4a921e1c..a30d95130 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -1009,6 +1009,7 @@ NOTE: + overview="${src.java.dir}/org/apache/fop/overview.html" + maxmemory="256M"> + ++ +
+
+ diff --git a/0005-NPE-FOP-2461.patch b/0005-NPE-FOP-2461.patch deleted file mode 100644 index 330fe2f..0000000 --- a/0005-NPE-FOP-2461.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 933f4f76b3af4bd8dc109dc375db84c44ea167f9 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Fri, 7 Aug 2015 13:03:32 +0200 -Subject: [PATCH 5/6] NPE-FOP-2461 - ---- - src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java -index 9ba1bce..b42c635 100644 ---- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java -+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java -@@ -393,7 +393,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage - int breakClass = EN_AUTO; - KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0]) - : null; -- Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null; -+ Position originalLabelPosition = -+ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null; - if (endEl instanceof KnuthPenalty) { - additionalPenaltyHeight = endEl.getWidth(); - stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math -@@ -402,7 +403,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage - ((KnuthPenalty) endEl).getBreakClass()); - } - endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null; -- Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null; -+ Position originalBodyPosition = -+ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null; - if (endEl instanceof KnuthPenalty) { - additionalPenaltyHeight = Math.max( - additionalPenaltyHeight, endEl.getWidth()); --- -2.9.3 - diff --git a/0006-Allow-javascript-in-javadoc.patch b/0006-Allow-javascript-in-javadoc.patch deleted file mode 100644 index f1ca05b..0000000 --- a/0006-Allow-javascript-in-javadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2484113b0226421a357a82b9cc021725b73e8251 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 1 Feb 2017 13:10:03 +0100 -Subject: [PATCH 6/6] Allow javascript in javadoc - ---- - build.xml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build.xml b/build.xml -index 4f212f0..d2734e1 100644 ---- a/build.xml -+++ b/build.xml -@@ -965,6 +965,7 @@ NOTE: - overview="${src.dir}/java/org/apache/fop/overview.html" - maxmemory="256M"> - -+ -
-
- --- -2.9.3 - diff --git a/0006-Non-free-colour-profile-was-removed.patch b/0006-Non-free-colour-profile-was-removed.patch new file mode 100644 index 0000000..48a8abb --- /dev/null +++ b/0006-Non-free-colour-profile-was-removed.patch @@ -0,0 +1,22 @@ +From: Peter Lemenkov +Date: Thu, 17 May 2018 16:26:24 +0300 +Subject: [PATCH] Non-free colour profile was removed + +See commit e0d614e3ab7019a7ac97471ebcc7d5b173abff99 for further details. + +Signed-off-by: Peter Lemenkov + +diff --git a/README b/README +index cc83c7216..f9231ba92 100644 +--- a/README ++++ b/README +@@ -42,9 +42,6 @@ Legal information on libraries used by Apache FOP can be found in the + + Here is a list of files included in Apache FOP but not published under Apache + License version 2.0: +-- sRGB IEC61966-2.1 color profile +- File: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm +- Info: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt + - K3 3 of 9 barcode font (TrueType) + File: examples/fo/advanced/K3.TTF + Info: examples/fo/advanced/K3.README diff --git a/fop.spec b/fop.spec index 77924cc..ae19f5e 100644 --- a/fop.spec +++ b/fop.spec @@ -1,51 +1,49 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.0 -Release: 9%{?dist} +Version: 2.2 +Release: 1%{?dist} # ASL 1.1: -# several files in src/java/org/apache/fop/render/awt/viewer/resources/ +# several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 License: ASL 2.0 and ASL 1.1 -URL: http://xmlgraphics.apache.org/fop -# ./clean-tarball %%{version} -Source0: %{name}-%{version}-clean.tar.gz +URL: https://xmlgraphics.apache.org/fop +Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{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 -Source4: http://www.apache.org/licenses/LICENSE-1.1.txt -Patch0: 0001-Main.patch -Patch1: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch -Patch2: 0003-Disable-javadoc-doclint.patch -Patch3: 0004-Port-to-QDox-2.0.patch -# https://issues.apache.org/jira/browse/FOP-2461 -Patch4: 0005-NPE-FOP-2461.patch -Patch5: 0006-Allow-javascript-in-javadoc.patch +Source3: https://maven.ibiblio.org/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom +Source4: https://www.apache.org/licenses/LICENSE-1.1.txt +Patch1: 0001-Main.patch +Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch +Patch3: 0003-Disable-javadoc-doclint.patch +Patch4: 0004-Port-to-QDox-2.0.patch +Patch5: 0005-Allow-javascript-in-javadoc.patch +Patch6: 0006-Non-free-colour-profile-was-removed.patch BuildArch: noarch -Requires: xmlgraphics-commons >= 1.5 -Requires: avalon-framework >= 4.1.4 -Requires: batik >= 1.7 -Requires: xalan-j2 >= 2.7.0 -Requires: xml-commons-apis >= 1.3.04 -Requires: jakarta-commons-httpclient Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 +Requires: avalon-framework >= 4.1.4 +Requires: batik >= 1.7 Requires: fontbox +Requires: jakarta-commons-httpclient Requires: java +Requires: xalan-j2 >= 2.7.0 +Requires: xml-commons-apis >= 1.3.04 +Requires: xmlgraphics-commons >= 1.5 BuildRequires: ant -BuildRequires: javapackages-local -BuildRequires: apache-commons-logging BuildRequires: apache-commons-io +BuildRequires: apache-commons-logging BuildRequires: avalon-framework -BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: batik -BuildRequires: servlet -BuildRequires: qdox -BuildRequires: xmlunit -BuildRequires: junit BuildRequires: fontbox +BuildRequires: javapackages-local +BuildRequires: junit +BuildRequires: qdox +BuildRequires: servlet +BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: xmlunit %description FOP is the world's first print formatter driven by XSL formatting @@ -62,18 +60,14 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%autosetup -p1 cp %{SOURCE4} LICENSE-1.1 +rm -f fop/lib/*.jar fop/lib/build/*.jar + #upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 -ln -s %{_javadir}/qdox.jar lib/build/qdox.jar +ln -s %{_javadir}/qdox.jar fop/lib/build/qdox.jar %build #qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 @@ -81,16 +75,18 @@ export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ fontbox xmlgraphics-commons batik-all avalon-framework-api \ avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis \ xml-commons-apis-ext objectweb-asm/asm-all xmlunit) -ant jar-main transcoder-pkg javadocs +export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 +ant -f fop/build.xml jar-main transcoder-pkg javadocs %install # inject OSGi manifest -jar ufm build/%{name}.jar %{SOURCE2} +jar ufm fop/build/%{name}.jar %{SOURCE2} + # jars install -d -m 755 %{buildroot}%{_javadir} -install -p -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -install -p -m 644 build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar +install -p -m 644 fop/build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 fop/build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar # script install -d -m 755 %{buildroot}%{_bindir} @@ -98,11 +94,11 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/fop # data install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf -cp -rp conf/* %{buildroot}%{_datadir}/%{name}/conf +cp -rp fop/conf/* %{buildroot}%{_datadir}/%{name}/conf # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -rp build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +cp -rp fop/build/javadocs/* %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_mavenpomdir} install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom @@ -121,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu May 17 2018 Peter Lemenkov - 2.2-1 +- Ver. 2.2 + * Wed Feb 07 2018 Fedora Release Engineering - 2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From bdf0f9faf46b324871703f77e469b1c554528897 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 18 May 2018 14:54:18 +0300 Subject: [PATCH 27/73] Forgot to upload sources Signed-off-by: Peter Lemenkov --- .gitignore | 2 ++ sources | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cbd8a15..cfcb5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ fop-1.0-src.tar.gz /LICENSE-1.1.txt /fop-2.0-clean.tar.gz /fop-2.0.pom +/fop-2.2.pom +/fop-2.2-src.tar.gz diff --git a/sources b/sources index 0e607c2..5ea63f3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -be48a90731a82b8e752a6460f544290d fop-2.0-clean.tar.gz -3e6fd7f8ae8da63b6ff8f13bf09f0ae6 fop-2.0.pom -92afa66b413bb09a3bbd590091a836f5 LICENSE-1.1.txt +SHA512 (fop-2.2.pom) = 2b61917075233d1decadb35c9bd3a3b7333dedf14e274345d9e836acd5a83f04a0e07ad505ac50ea34e81a7ea2d79298c26f1e7ce64fc0924def265d6724eff1 +SHA512 (fop-2.2-src.tar.gz) = 9b44bb41368763d639927e5ed46b056fc932fc04514db9325721c3c5aa1d7dc34607ae69251b9d67d5bc7a56f01eb0f9e298a7b52e8d6c3a64a0304764478d7c +SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 From 3cb2a2e7d5d12a8b4fa9b7149e4b2bfdbf9755e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:45:19 +0000 Subject: [PATCH 28/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index ae19f5e..1ad032d 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -117,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu May 17 2018 Peter Lemenkov - 2.2-1 - Ver. 2.2 From e5bbcb57a9d058c43dc90890d3dc955e1c6e6633 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 31 Aug 2018 10:21:01 +0200 Subject: [PATCH 29/73] Add explicit javapackages-tools requirement --- fop.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 1ad032d..7316936 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -31,6 +31,9 @@ Requires: java Requires: xalan-j2 >= 2.7.0 Requires: xml-commons-apis >= 1.3.04 Requires: xmlgraphics-commons >= 1.5 +# Explicit requires for javapackages-tools since fop script +# uses /usr/share/java-utils/java-functions +Requires: javapackages-tools BuildRequires: ant BuildRequires: apache-commons-io @@ -117,6 +120,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Aug 31 2018 Severin Gehwolf - 2.2-3 +- Add explicit javapackages-tools requirement since fop script + uses java-functions. See RHBZ#1600426. + * Fri Jul 13 2018 Fedora Release Engineering - 2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 165dfc634ca5bad808cee209ffb235cc34bca712 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:00:24 +0000 Subject: [PATCH 30/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 7316936..c7d6a53 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -120,6 +120,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 31 2018 Severin Gehwolf - 2.2-3 - Add explicit javapackages-tools requirement since fop script uses java-functions. See RHBZ#1600426. From 3f3358ead23cfea2380b50be8f6bbc47d894c58b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 00:53:14 +0000 Subject: [PATCH 31/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index c7d6a53..587dfc1 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -120,6 +120,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7350c234ab1e00af5528503f029fbbb2022120b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 18:50:25 +0000 Subject: [PATCH 32/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 587dfc1..eaec172 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.2 -Release: 5%{?dist} +Release: 6%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -120,6 +120,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1508f5006cc60aa3ede021a0c945b2f775d71e48 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Feb 2020 16:02:05 +0100 Subject: [PATCH 33/73] Fop ver. 2.4 Signed-off-by: Peter Lemenkov --- .gitignore | 13 +++++------ 0001-Main.patch | 4 ++-- 0003-Disable-javadoc-doclint.patch | 4 ++-- 0005-Allow-javascript-in-javadoc.patch | 4 ++-- ...-Non-free-colour-profile-was-removed.patch | 22 ------------------- fop.spec | 13 ++++++----- sources | 4 ++-- 7 files changed, 20 insertions(+), 44 deletions(-) delete mode 100644 0006-Non-free-colour-profile-was-removed.patch diff --git a/.gitignore b/.gitignore index cfcb5f2..4d004e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,7 @@ -fop-0.95-src.tar.gz -fop-1.0-src.tar.gz -/event-model.tgz -/fop-1.1-src.tar.gz -/fop-1.1-clean.tar.gz /LICENSE-1.1.txt +/event-model.tgz +/fop-0.95-src.tar.gz +/fop-1.1-clean.tar.gz /fop-2.0-clean.tar.gz -/fop-2.0.pom -/fop-2.2.pom -/fop-2.2-src.tar.gz +/fop-[0-9]*.[0-9]*-src.tar.gz +/fop-[0-9]*.[0-9]*.pom diff --git a/0001-Main.patch b/0001-Main.patch index 9ff5d31..1d83354 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Main diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index e082265f1..143a57cb6 100644 +index b8ba68df9..b14bc831e 100644 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java -@@ -213,11 +213,7 @@ public final class Main { +@@ -210,11 +210,7 @@ public final class Main { * @param args the command line parameters */ public static void main(String[] args) { diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index f61daa7..552f41c 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Disable javadoc doclint diff --git a/fop/build.xml b/fop/build.xml -index 3110bf00d..a4a921e1c 100644 +index 1bd733550..d513e7b3c 100644 --- a/fop/build.xml +++ b/fop/build.xml -@@ -1008,6 +1008,7 @@ NOTE: +@@ -1003,6 +1003,7 @@ NOTE: bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." overview="${src.java.dir}/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0005-Allow-javascript-in-javadoc.patch b/0005-Allow-javascript-in-javadoc.patch index f9e3260..ad5e089 100644 --- a/0005-Allow-javascript-in-javadoc.patch +++ b/0005-Allow-javascript-in-javadoc.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Allow javascript in javadoc diff --git a/fop/build.xml b/fop/build.xml -index a4a921e1c..a30d95130 100644 +index d513e7b3c..6e83ce75f 100644 --- a/fop/build.xml +++ b/fop/build.xml -@@ -1009,6 +1009,7 @@ NOTE: +@@ -1004,6 +1004,7 @@ NOTE: overview="${src.java.dir}/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0006-Non-free-colour-profile-was-removed.patch b/0006-Non-free-colour-profile-was-removed.patch deleted file mode 100644 index 48a8abb..0000000 --- a/0006-Non-free-colour-profile-was-removed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 17 May 2018 16:26:24 +0300 -Subject: [PATCH] Non-free colour profile was removed - -See commit e0d614e3ab7019a7ac97471ebcc7d5b173abff99 for further details. - -Signed-off-by: Peter Lemenkov - -diff --git a/README b/README -index cc83c7216..f9231ba92 100644 ---- a/README -+++ b/README -@@ -42,9 +42,6 @@ Legal information on libraries used by Apache FOP can be found in the - - Here is a list of files included in Apache FOP but not published under Apache - License version 2.0: --- sRGB IEC61966-2.1 color profile -- File: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm -- Info: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt - - K3 3 of 9 barcode font (TrueType) - File: examples/fo/advanced/K3.TTF - Info: examples/fo/advanced/K3.README diff --git a/fop.spec b/fop.spec index eaec172..8a2b8b2 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.2 -Release: 6%{?dist} +Version: 2.4 +Release: 1%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -10,20 +10,18 @@ URL: https://xmlgraphics.apache.org/fop Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF -Source3: https://maven.ibiblio.org/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom Source4: https://www.apache.org/licenses/LICENSE-1.1.txt Patch1: 0001-Main.patch Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch3: 0003-Disable-javadoc-doclint.patch Patch4: 0004-Port-to-QDox-2.0.patch Patch5: 0005-Allow-javascript-in-javadoc.patch -Patch6: 0006-Non-free-colour-profile-was-removed.patch BuildArch: noarch Requires: apache-commons-io >= 1.2 Requires: apache-commons-logging >= 1.0.4 -Requires: avalon-framework >= 4.1.4 Requires: batik >= 1.7 Requires: fontbox Requires: jakarta-commons-httpclient @@ -38,7 +36,6 @@ Requires: javapackages-tools BuildRequires: ant BuildRequires: apache-commons-io BuildRequires: apache-commons-logging -BuildRequires: avalon-framework BuildRequires: batik BuildRequires: fontbox BuildRequires: javapackages-local @@ -120,6 +117,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Feb 21 2020 Peter Lemenkov - 2.4-1 +- Ver. 2.4 +- No nonger requires avalon framework + * Tue Jan 28 2020 Fedora Release Engineering - 2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 5ea63f3..75d4b2a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fop-2.2.pom) = 2b61917075233d1decadb35c9bd3a3b7333dedf14e274345d9e836acd5a83f04a0e07ad505ac50ea34e81a7ea2d79298c26f1e7ce64fc0924def265d6724eff1 -SHA512 (fop-2.2-src.tar.gz) = 9b44bb41368763d639927e5ed46b056fc932fc04514db9325721c3c5aa1d7dc34607ae69251b9d67d5bc7a56f01eb0f9e298a7b52e8d6c3a64a0304764478d7c +SHA512 (fop-2.4.pom) = 7c264430861baaf05d898845b131e1cd1750e0ba64276bce39bf008a7d37e6aca58ef67bac065b914788afa9265749df6637eaa483b8cf4f7cfcb1b7cfce16fa +SHA512 (fop-2.4-src.tar.gz) = 55e2839ef53fbd61ebd81a6bfc03d36770fc77176d5b245faf7f5693010ee0de20c0c6ef358086ba5edc8c0b6c9991b3eb2be180dc0333109daa7656e962f20a SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 From 98eaa0c5cb8a374eb9ea2c241d21b148afbd4e13 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Feb 2020 16:12:52 +0100 Subject: [PATCH 34/73] Remove unused file Signed-off-by: Peter Lemenkov --- fop-1.1.pom | 155 ---------------------------------------------------- 1 file changed, 155 deletions(-) delete mode 100644 fop-1.1.pom diff --git a/fop-1.1.pom b/fop-1.1.pom deleted file mode 100644 index bbad61a..0000000 --- a/fop-1.1.pom +++ /dev/null @@ -1,155 +0,0 @@ - - - - - 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 - - - From 41231334097fdfd0a1bb69f91bc87b7f7ee3152a Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 19:25:59 +0200 Subject: [PATCH 35/73] Rebuilt for JDK-11 --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 8a2b8b2..1eb8d52 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -117,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Feb 21 2020 Peter Lemenkov - 2.4-1 - Ver. 2.4 - No nonger requires avalon framework From d80ae0251879bda4ba65e0ee4ca2f85d2b30dbb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:42:50 +0000 Subject: [PATCH 36/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 1eb8d52..3f036a0 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -117,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 2.4-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 4b818903f87f422e47e808dc2f6287ec388dd622 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:02:42 +0000 Subject: [PATCH 37/73] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 3f036a0..8b8fec1 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.4 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -117,6 +117,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.4-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2618e005cb307a55f0b68b8dc3e0c187981a9724 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 23 Nov 2020 16:18:55 +0100 Subject: [PATCH 38/73] Fop ver. 2.5 Signed-off-by: Peter Lemenkov --- 0003-Disable-javadoc-doclint.patch | 4 +- 0005-Allow-javascript-in-javadoc.patch | 4 +- 0006-Revert-Fix-compile-on-newer-mvn.patch | 67 +++++++ 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch | 18 ++ 0008-Revert-FOP-2895-Build-at-root.patch | 24 +++ ...Ant-build-should-use-mvn-jar-to-avoi.patch | 165 ++++++++++++++++++ fop.script | 4 +- fop.spec | 23 ++- sources | 4 +- 9 files changed, 299 insertions(+), 14 deletions(-) create mode 100644 0006-Revert-Fix-compile-on-newer-mvn.patch create mode 100644 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch create mode 100644 0008-Revert-FOP-2895-Build-at-root.patch create mode 100644 0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 552f41c..329b5d0 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Disable javadoc doclint diff --git a/fop/build.xml b/fop/build.xml -index 1bd733550..d513e7b3c 100644 +index 6f4b00e78..cabd73d46 100644 --- a/fop/build.xml +++ b/fop/build.xml -@@ -1003,6 +1003,7 @@ NOTE: +@@ -905,6 +905,7 @@ NOTE: bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." overview="${src.java.dir}/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0005-Allow-javascript-in-javadoc.patch b/0005-Allow-javascript-in-javadoc.patch index ad5e089..fe17806 100644 --- a/0005-Allow-javascript-in-javadoc.patch +++ b/0005-Allow-javascript-in-javadoc.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Allow javascript in javadoc diff --git a/fop/build.xml b/fop/build.xml -index d513e7b3c..6e83ce75f 100644 +index cabd73d46..3b83424c1 100644 --- a/fop/build.xml +++ b/fop/build.xml -@@ -1004,6 +1004,7 @@ NOTE: +@@ -906,6 +906,7 @@ NOTE: overview="${src.java.dir}/org/apache/fop/overview.html" maxmemory="256M"> diff --git a/0006-Revert-Fix-compile-on-newer-mvn.patch b/0006-Revert-Fix-compile-on-newer-mvn.patch new file mode 100644 index 0000000..bb2eff8 --- /dev/null +++ b/0006-Revert-Fix-compile-on-newer-mvn.patch @@ -0,0 +1,67 @@ +From: Peter Lemenkov +Date: Mon, 23 Nov 2020 16:51:21 +0100 +Subject: [PATCH] Revert "Fix compile on newer mvn" + +This reverts commit d1022f8e33ad8c234c13e7109fba2fe5797f5a64. + +diff --git a/fop/build.xml b/fop/build.xml +index 3b83424c1..a526d13dd 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -615,7 +615,7 @@ list of possible build targets. + + + +- ++ + + + +diff --git a/pom.xml b/pom.xml +index 3aac301c7..75eaed176 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -84,6 +84,8 @@ + + ${java.version} + ${java.version} ++ ${jdk.path}/bin/javac ++ true + + + +@@ -105,34 +107,6 @@ + + + +- +- +- custom-javac +- +- +- jdk.path +- +- +- +- +- +- +- org.apache.maven.plugins +- maven-compiler-plugin +- ${compiler.plugin.version} +- +- ${java.version} +- ${java.version} +- ${jdk.path}/bin/javac +- true +- +- +- +- +- +- +- +- + + scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/ + scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/ diff --git a/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch b/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch new file mode 100644 index 0000000..27b3d3b --- /dev/null +++ b/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch @@ -0,0 +1,18 @@ +From: Peter Lemenkov +Date: Mon, 23 Nov 2020 16:51:36 +0100 +Subject: [PATCH] Revert "FOP-2895: Try to fix Java 7" + +This reverts commit b696bac863370a617cb1a048228c4dd06dabddcc. + +diff --git a/fop/build.xml b/fop/build.xml +index a526d13dd..7d8de1773 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -616,7 +616,6 @@ list of possible build targets. + + + +- + + + diff --git a/0008-Revert-FOP-2895-Build-at-root.patch b/0008-Revert-FOP-2895-Build-at-root.patch new file mode 100644 index 0000000..f9dbe61 --- /dev/null +++ b/0008-Revert-FOP-2895-Build-at-root.patch @@ -0,0 +1,24 @@ +From: Peter Lemenkov +Date: Mon, 23 Nov 2020 16:51:59 +0100 +Subject: [PATCH] Revert "FOP-2895: Build at root" + +This reverts commit 1ef4f9b38f8c89affaa0c0eb4dc3a3ca345e2303. + +diff --git a/fop/build.xml b/fop/build.xml +index 7d8de1773..b6eb76642 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -615,7 +615,12 @@ list of possible build targets. + + + +- ++ ++ ++ ++ ++ ++ + + + diff --git a/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch b/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch new file mode 100644 index 0000000..fbd08ae --- /dev/null +++ b/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch @@ -0,0 +1,165 @@ +From: Peter Lemenkov +Date: Mon, 23 Nov 2020 16:52:11 +0100 +Subject: [PATCH] Revert "FOP-2895: Ant build should use mvn jar to avoid + duplicate transcoder configuration" + +This reverts commit d113056a8bfb73695f21a98e2715cd04459a09bc. + +diff --git a/fop-transcoder/src/tools/resources/assembly/assembly.xml b/fop-transcoder/src/tools/resources/assembly/assembly.xml +index 90d77524f..99eb0fb17 100644 +--- a/fop-transcoder/src/tools/resources/assembly/assembly.xml ++++ b/fop-transcoder/src/tools/resources/assembly/assembly.xml +@@ -52,14 +52,12 @@ + org/apache/fop/util/ASCII*.class + org/apache/fop/util/AbstractPaintingState** + org/apache/fop/util/CMYKColorSpace*.class +- org/apache/fop/util/CharUtilities*.class ++ org/apache/fop/util/CharUtilities.class + org/apache/fop/util/Color*.class + org/apache/fop/util/DecimalFormatCache*.class + org/apache/fop/util/Finalizable.class + org/apache/fop/util/ImageObject.class + org/apache/fop/util/SubInputStream.class +- org/apache/fop/util/HexEncoder.class +- org/apache/fop/configuration/** + + + org/apache/fop/render/pdf/PSRenderer.class +diff --git a/fop/build.xml b/fop/build.xml +index b6eb76642..fc17bf158 100644 +--- a/fop/build.xml ++++ b/fop/build.xml +@@ -606,6 +606,59 @@ list of possible build targets. + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -614,19 +667,60 @@ list of possible build targets. + + + +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/fop.script b/fop.script index 64e2bf7..902d643 100644 --- a/fop.script +++ b/fop.script @@ -25,8 +25,8 @@ fi MAIN_CLASS=org.apache.fop.cli.Main # Set parameters set_jvm -set_classpath commons-io batik-all avalon-framework-api \ - avalon-framework-impl xmlgraphics-commons xml-commons-apis-ext \ +set_classpath commons-io batik-all \ + xmlgraphics-commons xml-commons-apis-ext \ commons-logging fontbox fop set_flags $BASE_FLAGS set_options $BASE_OPTIONS diff --git a/fop.spec b/fop.spec index 8b8fec1..7d26e4d 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.4 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -17,6 +17,10 @@ Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch3: 0003-Disable-javadoc-doclint.patch Patch4: 0004-Port-to-QDox-2.0.patch Patch5: 0005-Allow-javascript-in-javadoc.patch +Patch6: 0006-Revert-Fix-compile-on-newer-mvn.patch +Patch7: 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch +Patch8: 0008-Revert-FOP-2895-Build-at-root.patch +Patch9: 0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch BuildArch: noarch @@ -44,6 +48,7 @@ BuildRequires: qdox BuildRequires: servlet BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: xmlunit +BuildRequires: xmlunit-core %description FOP is the world's first print formatter driven by XSL formatting @@ -72,11 +77,13 @@ ln -s %{_javadir}/qdox.jar fop/lib/build/qdox.jar %build #qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ - fontbox xmlgraphics-commons batik-all avalon-framework-api \ - avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis \ + fontbox xmlgraphics-commons batik-all \ + servlet batik/batik-svg-dom xml-commons-apis \ xml-commons-apis-ext objectweb-asm/asm-all xmlunit) export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 -ant -f fop/build.xml jar-main transcoder-pkg javadocs +# FIXME no javadocs for now +#ant -f fop/build.xml jar-main transcoder-pkg javadocs +ant -f fop/build.xml jar-main transcoder-pkg %install # inject OSGi manifest @@ -98,7 +105,8 @@ cp -rp fop/conf/* %{buildroot}%{_datadir}/%{name}/conf # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -rp fop/build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +# FIXME no javadocs for now +#cp -rp fop/build/javadocs/* %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_mavenpomdir} install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom @@ -117,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Mon Nov 23 2020 Peter Lemenkov - 2.5-1 +- Ver. 2.5 + * Sat Aug 01 2020 Fedora Release Engineering - 2.4-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 75d4b2a..5761230 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fop-2.4.pom) = 7c264430861baaf05d898845b131e1cd1750e0ba64276bce39bf008a7d37e6aca58ef67bac065b914788afa9265749df6637eaa483b8cf4f7cfcb1b7cfce16fa -SHA512 (fop-2.4-src.tar.gz) = 55e2839ef53fbd61ebd81a6bfc03d36770fc77176d5b245faf7f5693010ee0de20c0c6ef358086ba5edc8c0b6c9991b3eb2be180dc0333109daa7656e962f20a SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 +SHA512 (fop-2.5-src.tar.gz) = 313e286e67af6d48fa3caed5e07b493a0d5113c428f78871e9098c2d699aa0ff24a8e019bf259e0b6a4290fc384796ed30fd5260cb8a2a6c3660f5ea65c51adb +SHA512 (fop-2.5.pom) = ae3239208414dfd3768b4f8af26b81b81c9d7ede1a9030907aed7a8c0c6756e0a116b36c2aeae01e29cc0767772ca28df4ba00894c67a218c78f9341cefacef2 From 952e63d64a83b16fe491ad161f6067a0f0730e59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:48:34 +0000 Subject: [PATCH 39/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 7d26e4d..a3a327a 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 23 2020 Peter Lemenkov - 2.5-1 - Ver. 2.5 From fd19d2765cd3ce4cb16480f6cf8203d0e9e64b17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:14:34 +0000 Subject: [PATCH 40/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index a3a327a..1baa558 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.5 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -125,6 +125,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 27e0713a7fbfc3edadf8a849c614156334fa0129 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 25 Aug 2021 09:06:50 -0600 Subject: [PATCH 41/73] Update to 2.6, build with maven --- 0001-Main.patch | 22 --- ...cc-color-profile-from-colord-package.patch | 33 ---- 0003-Disable-javadoc-doclint.patch | 17 -- 0005-Allow-javascript-in-javadoc.patch | 17 -- 0006-Revert-Fix-compile-on-newer-mvn.patch | 67 ------- 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch | 18 -- 0008-Revert-FOP-2895-Build-at-root.patch | 24 --- ...Ant-build-should-use-mvn-jar-to-avoi.patch | 165 ------------------ fop.spec | 81 ++++----- sources | 3 +- 10 files changed, 39 insertions(+), 408 deletions(-) delete mode 100644 0001-Main.patch delete mode 100644 0002-Use-sRGB.icc-color-profile-from-colord-package.patch delete mode 100644 0003-Disable-javadoc-doclint.patch delete mode 100644 0005-Allow-javascript-in-javadoc.patch delete mode 100644 0006-Revert-Fix-compile-on-newer-mvn.patch delete mode 100644 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch delete mode 100644 0008-Revert-FOP-2895-Build-at-root.patch delete mode 100644 0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch diff --git a/0001-Main.patch b/0001-Main.patch deleted file mode 100644 index 1d83354..0000000 --- a/0001-Main.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Simacek -Date: Tue, 14 Jul 2015 16:54:43 +0200 -Subject: [PATCH] Main - - -diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index b8ba68df9..b14bc831e 100644 ---- a/fop-core/src/main/java/org/apache/fop/cli/Main.java -+++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java -@@ -210,11 +210,7 @@ public final class Main { - * @param args the command line parameters - */ - public static void main(String[] args) { -- if (checkDependencies()) { -- startFOP(args); -- } else { -- startFOPWithDynamicClasspath(args); -- } -+ startFOP(args); - } - - } diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch deleted file mode 100644 index fa3157b..0000000 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Michael Simacek -Date: Tue, 14 Jul 2015 16:56:49 +0200 -Subject: [PATCH] Use sRGB.icc color profile from colord package - - -diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -index 704898def..1ce14cb4e 100644 ---- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -@@ -22,7 +22,9 @@ package org.apache.fop.pdf; - import java.awt.color.ColorSpace; - import java.awt.color.ICC_Profile; - import java.io.IOException; -+import java.io.FileNotFoundException; - import java.io.InputStream; -+import java.io.FileInputStream; - import java.util.Set; - - import org.apache.commons.io.IOUtils; -@@ -138,7 +140,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.icc"); -+ InputStream in; -+ try { -+ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); -+ } catch (FileNotFoundException e) { -+ in = null; -+ } - if (in != null) { - try { - profile = ColorProfileUtil.getICC_Profile(in); diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch deleted file mode 100644 index 329b5d0..0000000 --- a/0003-Disable-javadoc-doclint.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Mikolaj Izdebski -Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH] Disable javadoc doclint - - -diff --git a/fop/build.xml b/fop/build.xml -index 6f4b00e78..cabd73d46 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -905,6 +905,7 @@ NOTE: - bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." - overview="${src.java.dir}/org/apache/fop/overview.html" - maxmemory="256M"> -+ -
-
- diff --git a/0005-Allow-javascript-in-javadoc.patch b/0005-Allow-javascript-in-javadoc.patch deleted file mode 100644 index fe17806..0000000 --- a/0005-Allow-javascript-in-javadoc.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Michael Simacek -Date: Wed, 1 Feb 2017 13:10:03 +0100 -Subject: [PATCH] Allow javascript in javadoc - - -diff --git a/fop/build.xml b/fop/build.xml -index cabd73d46..3b83424c1 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -906,6 +906,7 @@ NOTE: - overview="${src.java.dir}/org/apache/fop/overview.html" - maxmemory="256M"> - -+ -
-
- diff --git a/0006-Revert-Fix-compile-on-newer-mvn.patch b/0006-Revert-Fix-compile-on-newer-mvn.patch deleted file mode 100644 index bb2eff8..0000000 --- a/0006-Revert-Fix-compile-on-newer-mvn.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Peter Lemenkov -Date: Mon, 23 Nov 2020 16:51:21 +0100 -Subject: [PATCH] Revert "Fix compile on newer mvn" - -This reverts commit d1022f8e33ad8c234c13e7109fba2fe5797f5a64. - -diff --git a/fop/build.xml b/fop/build.xml -index 3b83424c1..a526d13dd 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -615,7 +615,7 @@ list of possible build targets. - - - -- -+ - - - -diff --git a/pom.xml b/pom.xml -index 3aac301c7..75eaed176 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -84,6 +84,8 @@ - - ${java.version} - ${java.version} -+ ${jdk.path}/bin/javac -+ true - - - -@@ -105,34 +107,6 @@ - - - -- -- -- custom-javac -- -- -- jdk.path -- -- -- -- -- -- -- org.apache.maven.plugins -- maven-compiler-plugin -- ${compiler.plugin.version} -- -- ${java.version} -- ${java.version} -- ${jdk.path}/bin/javac -- true -- -- -- -- -- -- -- -- - - scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/ - scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/ diff --git a/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch b/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch deleted file mode 100644 index 27b3d3b..0000000 --- a/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Peter Lemenkov -Date: Mon, 23 Nov 2020 16:51:36 +0100 -Subject: [PATCH] Revert "FOP-2895: Try to fix Java 7" - -This reverts commit b696bac863370a617cb1a048228c4dd06dabddcc. - -diff --git a/fop/build.xml b/fop/build.xml -index a526d13dd..7d8de1773 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -616,7 +616,6 @@ list of possible build targets. - - - -- - - - diff --git a/0008-Revert-FOP-2895-Build-at-root.patch b/0008-Revert-FOP-2895-Build-at-root.patch deleted file mode 100644 index f9dbe61..0000000 --- a/0008-Revert-FOP-2895-Build-at-root.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Peter Lemenkov -Date: Mon, 23 Nov 2020 16:51:59 +0100 -Subject: [PATCH] Revert "FOP-2895: Build at root" - -This reverts commit 1ef4f9b38f8c89affaa0c0eb4dc3a3ca345e2303. - -diff --git a/fop/build.xml b/fop/build.xml -index 7d8de1773..b6eb76642 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -615,7 +615,12 @@ list of possible build targets. - - - -- -+ -+ -+ -+ -+ -+ - - - diff --git a/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch b/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch deleted file mode 100644 index fbd08ae..0000000 --- a/0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch +++ /dev/null @@ -1,165 +0,0 @@ -From: Peter Lemenkov -Date: Mon, 23 Nov 2020 16:52:11 +0100 -Subject: [PATCH] Revert "FOP-2895: Ant build should use mvn jar to avoid - duplicate transcoder configuration" - -This reverts commit d113056a8bfb73695f21a98e2715cd04459a09bc. - -diff --git a/fop-transcoder/src/tools/resources/assembly/assembly.xml b/fop-transcoder/src/tools/resources/assembly/assembly.xml -index 90d77524f..99eb0fb17 100644 ---- a/fop-transcoder/src/tools/resources/assembly/assembly.xml -+++ b/fop-transcoder/src/tools/resources/assembly/assembly.xml -@@ -52,14 +52,12 @@ - org/apache/fop/util/ASCII*.class - org/apache/fop/util/AbstractPaintingState** - org/apache/fop/util/CMYKColorSpace*.class -- org/apache/fop/util/CharUtilities*.class -+ org/apache/fop/util/CharUtilities.class - org/apache/fop/util/Color*.class - org/apache/fop/util/DecimalFormatCache*.class - org/apache/fop/util/Finalizable.class - org/apache/fop/util/ImageObject.class - org/apache/fop/util/SubInputStream.class -- org/apache/fop/util/HexEncoder.class -- org/apache/fop/configuration/** - - - org/apache/fop/render/pdf/PSRenderer.class -diff --git a/fop/build.xml b/fop/build.xml -index b6eb76642..fc17bf158 100644 ---- a/fop/build.xml -+++ b/fop/build.xml -@@ -606,6 +606,59 @@ list of possible build targets. - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -614,19 +667,60 @@ list of possible build targets. - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/fop.spec b/fop.spec index 1baa558..55ec177 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.5 -Release: 3%{?dist} +Version: 2.6 +Release: 1%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -10,44 +10,40 @@ URL: https://xmlgraphics.apache.org/fop Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF -Source3: https://repo1.maven.org/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom Source4: https://www.apache.org/licenses/LICENSE-1.1.txt -Patch1: 0001-Main.patch -Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch -Patch3: 0003-Disable-javadoc-doclint.patch +#Patch0: fop-xmlunit.patch Patch4: 0004-Port-to-QDox-2.0.patch -Patch5: 0005-Allow-javascript-in-javadoc.patch -Patch6: 0006-Revert-Fix-compile-on-newer-mvn.patch -Patch7: 0007-Revert-FOP-2895-Try-to-fix-Java-7.patch -Patch8: 0008-Revert-FOP-2895-Build-at-root.patch -Patch9: 0009-Revert-FOP-2895-Ant-build-should-use-mvn-jar-to-avoi.patch BuildArch: noarch -Requires: apache-commons-io >= 1.2 -Requires: apache-commons-logging >= 1.0.4 -Requires: batik >= 1.7 -Requires: fontbox -Requires: jakarta-commons-httpclient Requires: java Requires: xalan-j2 >= 2.7.0 Requires: xml-commons-apis >= 1.3.04 -Requires: xmlgraphics-commons >= 1.5 # Explicit requires for javapackages-tools since fop script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools -BuildRequires: ant BuildRequires: apache-commons-io BuildRequires: apache-commons-logging BuildRequires: batik BuildRequires: fontbox BuildRequires: javapackages-local BuildRequires: junit +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-clean-plugin +BuildRequires: maven-local +BuildRequires: maven-plugin-build-helper +BuildRequires: mvn(javax.servlet:servlet-api) +# For servlet, not packaged +#BuildRequires: maven-war-plugin +BuildRequires: pdfbox BuildRequires: qdox BuildRequires: servlet +BuildRequires: xml-maven-plugin BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: xmlunit +BuildRequires: xmlunit-assertj BuildRequires: xmlunit-core %description @@ -71,29 +67,31 @@ cp %{SOURCE4} LICENSE-1.1 rm -f fop/lib/*.jar fop/lib/build/*.jar -#upstream workaround -- many thanks to spepping@apache.org -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 -ln -s %{_javadir}/qdox.jar fop/lib/build/qdox.jar +# Not packaged +%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin +%pom_remove_dep javax.media:jai-core fop-core +%pom_remove_dep com.sun.media:jai-codec fop-core +%pom_remove_dep net.sf.offo:fop-hyph fop-core +%pom_remove_dep net.sf.saxon:saxon fop-core +# Update to current xmlunit +%pom_change_dep xmlunit:xmlunit org.xmlunit:xmlunit-core fop-core +%pom_add_dep org.xmlunit:xmlunit-assertj3 fop-core +# Requires maven-war-plugin +%pom_disable_module fop-servlet +# Requires JAI, not packaged +rm fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java + %build -#qdox intentionally left off classpath -- see https://issues.apache.org/bugzilla/show_bug.cgi?id=50575 -export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io \ - fontbox xmlgraphics-commons batik-all \ - servlet batik/batik-svg-dom xml-commons-apis \ - xml-commons-apis-ext objectweb-asm/asm-all xmlunit) -export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 -# FIXME no javadocs for now -#ant -f fop/build.xml jar-main transcoder-pkg javadocs -ant -f fop/build.xml jar-main transcoder-pkg +# Skip tests for now, make dirs needed by build but created by tests +mkdir -p fop-events/target/test-classes +%mvn_build -f + %install +%mvn_install # inject OSGi manifest -jar ufm fop/build/%{name}.jar %{SOURCE2} - - -# jars -install -d -m 755 %{buildroot}%{_javadir} -install -p -m 644 fop/build/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar -install -p -m 644 fop/build/%{name}-transcoder.jar %{buildroot}%{_javadir}/pdf-transcoder.jar +jar ufm %{buildroot}%{_javadir}/%{name}/%{name}.jar %{SOURCE2} # script install -d -m 755 %{buildroot}%{_bindir} @@ -105,18 +103,12 @@ cp -rp fop/conf/* %{buildroot}%{_datadir}/%{name}/conf # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -# FIXME no javadocs for now -#cp -rp fop/build/javadocs/* %{buildroot}%{_javadocdir}/%{name} - -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar +cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles %doc LICENSE LICENSE-1.1 README NOTICE %{_datadir}/%{name} -%{_javadir}/pdf-transcoder.jar %{_bindir}/fop %files javadoc @@ -125,6 +117,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Wed Aug 25 2021 Orion Poplawski - 2.6-1 +- Update to 2.6, build with maven + * Wed Jul 21 2021 Fedora Release Engineering - 2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 5761230..8271b22 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.5-src.tar.gz) = 313e286e67af6d48fa3caed5e07b493a0d5113c428f78871e9098c2d699aa0ff24a8e019bf259e0b6a4290fc384796ed30fd5260cb8a2a6c3660f5ea65c51adb -SHA512 (fop-2.5.pom) = ae3239208414dfd3768b4f8af26b81b81c9d7ede1a9030907aed7a8c0c6756e0a116b36c2aeae01e29cc0767772ca28df4ba00894c67a218c78f9341cefacef2 +SHA512 (fop-2.6-src.tar.gz) = 221a3e52933c79c81f00ebaf48005c7ed92992cb10220840dddcaa0bbd249cc088e2f136061cfbbda9aaa3cfd3e73b28a37406cc1c29cf287bdcc0e7228974e1 From 1120840455b8c72b425e47d603a372413c463496 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 26 Aug 2021 19:48:02 +0200 Subject: [PATCH 42/73] Restore two patches Signed-off-by: Peter Lemenkov --- 0001-Main.patch | 22 +++++++++++++ ...cc-color-profile-from-colord-package.patch | 33 +++++++++++++++++++ fop.spec | 7 +++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-Main.patch create mode 100644 0002-Use-sRGB.icc-color-profile-from-colord-package.patch diff --git a/0001-Main.patch b/0001-Main.patch new file mode 100644 index 0000000..1d83354 --- /dev/null +++ b/0001-Main.patch @@ -0,0 +1,22 @@ +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:54:43 +0200 +Subject: [PATCH] Main + + +diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java +index b8ba68df9..b14bc831e 100644 +--- a/fop-core/src/main/java/org/apache/fop/cli/Main.java ++++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java +@@ -210,11 +210,7 @@ public final class Main { + * @param args the command line parameters + */ + public static void main(String[] args) { +- if (checkDependencies()) { +- startFOP(args); +- } else { +- startFOPWithDynamicClasspath(args); +- } ++ startFOP(args); + } + + } diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch new file mode 100644 index 0000000..fa3157b --- /dev/null +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -0,0 +1,33 @@ +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:56:49 +0200 +Subject: [PATCH] Use sRGB.icc color profile from colord package + + +diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +index 704898def..1ce14cb4e 100644 +--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +@@ -22,7 +22,9 @@ package org.apache.fop.pdf; + import java.awt.color.ColorSpace; + import java.awt.color.ICC_Profile; + import java.io.IOException; ++import java.io.FileNotFoundException; + import java.io.InputStream; ++import java.io.FileInputStream; + import java.util.Set; + + import org.apache.commons.io.IOUtils; +@@ -138,7 +140,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.icc"); ++ InputStream in; ++ try { ++ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); ++ } catch (FileNotFoundException e) { ++ in = null; ++ } + if (in != null) { + try { + profile = ColorProfileUtil.getICC_Profile(in); diff --git a/fop.spec b/fop.spec index 55ec177..f9f06b0 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -12,6 +12,8 @@ Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt #Patch0: fop-xmlunit.patch +Patch1: 0001-Main.patch +Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch4: 0004-Port-to-QDox-2.0.patch BuildArch: noarch @@ -117,6 +119,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Aug 26 2021 Peter Lemenkov - 2.6-2 +- Restore two patches + * Wed Aug 25 2021 Orion Poplawski - 2.6-1 - Update to 2.6, build with maven From fba0361894999fbf17c8672e96d4dc95cc06314f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 6 Dec 2021 11:16:14 +0000 Subject: [PATCH 43/73] Remove unnecessary BR on servlet --- fop.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fop.spec b/fop.spec index f9f06b0..8ac3ee9 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -41,7 +41,6 @@ BuildRequires: mvn(javax.servlet:servlet-api) #BuildRequires: maven-war-plugin BuildRequires: pdfbox BuildRequires: qdox -BuildRequires: servlet BuildRequires: xml-maven-plugin BuildRequires: xmlgraphics-commons >= 1.5 BuildRequires: xmlunit @@ -119,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Mon Dec 06 2021 Mat Booth - 2.6-3 +- Remove unnecessary BR on servlet + * Thu Aug 26 2021 Peter Lemenkov - 2.6-2 - Restore two patches From 23886d728b37ac70923e85e458f6d40f0e3ff25d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:17:56 +0000 Subject: [PATCH 44/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 8ac3ee9..a7bf780 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 06 2021 Mat Booth - 2.6-3 - Remove unnecessary BR on servlet From 1fefb54cb5d75e2e7f1c32077e8c505f9fab31d5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Jan 2022 14:14:09 +0100 Subject: [PATCH 45/73] Fop ver. 2.7 Signed-off-by: Peter Lemenkov --- fop.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fop.spec b/fop.spec index a7bf780..e9a60b0 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.6 -Release: 4%{?dist} +Version: 2.7 +Release: 1%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Jan 27 2022 Peter Lemenkov - 2.7-1 +- Update to 2.6 + * Thu Jan 20 2022 Fedora Release Engineering - 2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 8271b22..9fb0b62 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.6-src.tar.gz) = 221a3e52933c79c81f00ebaf48005c7ed92992cb10220840dddcaa0bbd249cc088e2f136061cfbbda9aaa3cfd3e73b28a37406cc1c29cf287bdcc0e7228974e1 +SHA512 (fop-2.7-src.tar.gz) = bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633 From 881a03ea74f1f0607d6fba34dc555625944a1558 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:38:51 +0100 Subject: [PATCH 46/73] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index e9a60b0..e33bad4 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Sat Feb 05 2022 Jiri Vanek - 2.7-2 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 27 2022 Peter Lemenkov - 2.7-1 - Update to 2.6 From afdaf3a425250031113c73583ee186d98bde880c Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 15:18:42 +0200 Subject: [PATCH 47/73] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- fop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index e33bad4..f44dbf3 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.7 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -17,6 +17,7 @@ Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch4: 0004-Port-to-QDox-2.0.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Requires: java Requires: xalan-j2 >= 2.7.0 @@ -118,6 +119,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Fri Jul 08 2022 Jiri Vanek - 2.7-3 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 2.7-2 - Rebuilt for java-17-openjdk as system jdk From 9dc5b4642a9b08657a49b8a22906d17f9c1e9a45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:29:26 +0000 Subject: [PATCH 48/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index f44dbf3..ef019c0 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -119,6 +119,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 2.7-3 - Rebuilt for Drop i686 JDKs From 20c820c74cc8f580952a20d02bb09b134e9e3590 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 16 Nov 2022 22:16:09 +0100 Subject: [PATCH 49/73] Fop ver. 2.8 Signed-off-by: Peter Lemenkov --- .gitignore | 3 --- 0001-Main.patch | 2 +- ...-sRGB.icc-color-profile-from-colord-package.patch | 2 +- ...-to-QDox-2.0.patch => 0003-Port-to-QDox-2.0.patch | 2 +- clean-tarball.sh | 2 -- fop.spec | 12 +++++++----- sources | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) rename 0004-Port-to-QDox-2.0.patch => 0003-Port-to-QDox-2.0.patch (99%) diff --git a/.gitignore b/.gitignore index 4d004e7..81fefe2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ /LICENSE-1.1.txt /event-model.tgz -/fop-0.95-src.tar.gz -/fop-1.1-clean.tar.gz -/fop-2.0-clean.tar.gz /fop-[0-9]*.[0-9]*-src.tar.gz /fop-[0-9]*.[0-9]*.pom diff --git a/0001-Main.patch b/0001-Main.patch index 1d83354..6fc2193 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Main diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index b8ba68df9..b14bc831e 100644 +index 85665d5..f400fc1 100644 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java @@ -210,11 +210,7 @@ public final class Main { diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index fa3157b..0d4923d 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Use sRGB.icc color profile from colord package diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -index 704898def..1ce14cb4e 100644 +index 592bc88..cdbc7cf 100644 --- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java @@ -22,7 +22,9 @@ package org.apache.fop.pdf; diff --git a/0004-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch similarity index 99% rename from 0004-Port-to-QDox-2.0.patch rename to 0003-Port-to-QDox-2.0.patch index c395e39..5136fa2 100644 --- a/0004-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Port to QDox 2.0 diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -index 2351fc870..64cd7edf0 100644 +index 5428cbb..fef4c2e 100644 --- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java @@ -21,6 +21,7 @@ package org.apache.fop.tools; diff --git a/clean-tarball.sh b/clean-tarball.sh index 0360298..12fae99 100755 --- a/clean-tarball.sh +++ b/clean-tarball.sh @@ -13,8 +13,6 @@ tar xvf ${NAME}-${VERSION}-src.tar.gz ( cd ${NAME}-${VERSION} - # non-free color profile - find src/java/org/apache/fop/pdf/ -name "*.icm*" -delete find ./ -name "*.jar" -delete find ./ -name "*.pdf" -delete # serialized objects diff --git a/fop.spec b/fop.spec index ef019c0..e947231 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.7 -Release: 4%{?dist} +Version: 2.8 +Release: 1%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -11,10 +11,9 @@ Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-% Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt -#Patch0: fop-xmlunit.patch Patch1: 0001-Main.patch Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch -Patch4: 0004-Port-to-QDox-2.0.patch +Patch3: 0003-Port-to-QDox-2.0.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -119,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Wed Nov 16 2022 Peter Lemenkov - 2.8-1 +- Update to 2.8 + * Thu Jul 21 2022 Fedora Release Engineering - 2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -129,7 +131,7 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} - Rebuilt for java-17-openjdk as system jdk * Thu Jan 27 2022 Peter Lemenkov - 2.7-1 -- Update to 2.6 +- Update to 2.7 * Thu Jan 20 2022 Fedora Release Engineering - 2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 9fb0b62..41ee34f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.7-src.tar.gz) = bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633 +SHA512 (fop-2.8-src.tar.gz) = 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357 From 584a07c0c4f5ad53000a832e2f6b1dbca4471448 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 16 Nov 2022 22:47:36 +0100 Subject: [PATCH 50/73] Build from cleaned up tarball Signed-off-by: Peter Lemenkov --- fop.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fop.spec b/fop.spec index e947231..60364a2 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.8 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Wed Nov 16 2022 Peter Lemenkov - 2.8-2 +- Build from cleaned up tarball + * Wed Nov 16 2022 Peter Lemenkov - 2.8-1 - Update to 2.8 diff --git a/sources b/sources index 41ee34f..f6d3697 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.8-src.tar.gz) = 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357 +SHA512 (fop-2.8-src.tar.gz) = 965b16cbedb386a2d6b0a8005bba72aa4f14e92259e4889ce49892b4498372a90d57ae4d7bace7425058562b6d0020fd233a303ed2642bfdd2c897ea454f5337 From 5cc39166ad3abfa279b71cf170ca4889d970c87a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 7 Dec 2022 16:14:54 +0100 Subject: [PATCH 51/73] Correct BR version Signed-off-by: Peter Lemenkov --- fop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 60364a2..53b83be 100644 --- a/fop.spec +++ b/fop.spec @@ -42,7 +42,7 @@ BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: pdfbox BuildRequires: qdox BuildRequires: xml-maven-plugin -BuildRequires: xmlgraphics-commons >= 1.5 +BuildRequires: xmlgraphics-commons >= 2.8 BuildRequires: xmlunit BuildRequires: xmlunit-assertj BuildRequires: xmlunit-core From 26ad7171b49993731ba083e80bbb51de851f5310 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:45:40 +0000 Subject: [PATCH 52/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 53b83be..5abf0fa 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 16 2022 Peter Lemenkov - 2.8-2 - Build from cleaned up tarball From 182bcfccaa04af560b004da4d43c7ec7ea3e7802 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 27 Feb 2023 19:12:17 -0800 Subject: [PATCH 53/73] migrated to SPDX license Signed-off-by: Tim Orling --- fop.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fop.spec b/fop.spec index 5abf0fa..613b909 100644 --- a/fop.spec +++ b/fop.spec @@ -1,18 +1,18 @@ Name: fop Summary: XSL-driven print formatter Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 -License: ASL 2.0 and ASL 1.1 +License: Apache-2.0 AND Apache-1.1 URL: https://xmlgraphics.apache.org/fop Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt -Patch1: 0001-Main.patch -Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch +Patch1: 0001-Main.patch +Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch3: 0003-Port-to-QDox-2.0.patch BuildArch: noarch @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Mon Feb 27 2023 Tim Orling - 2.8-4 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f605ef458022706e2e1d287c4a57ba447378ab64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:04:54 +0000 Subject: [PATCH 54/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 613b909..78b0b44 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.8 -Release: 4%{?dist} +Release: 5%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -118,6 +118,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 27 2023 Tim Orling - 2.8-4 - migrated to SPDX license From 752837908ca41a36dcf1eb30df0cbdd2ee227435 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Aug 2023 18:49:00 +0200 Subject: [PATCH 55/73] Fop ver. 2.9 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + 0001-Main.patch | 6 +- ...cc-color-profile-from-colord-package.patch | 2 +- 0003-Port-to-QDox-2.0.patch | 2 +- changelog | 329 +++++++++++++++++ fop.spec | 349 +----------------- sources | 3 +- 7 files changed, 351 insertions(+), 341 deletions(-) create mode 100644 changelog diff --git a/.gitignore b/.gitignore index 81fefe2..6128dda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /LICENSE-1.1.txt /event-model.tgz /fop-[0-9]*.[0-9]*-src.tar.gz +/fop-[0-9]*.[0-9]*-src.tar.gz.asc /fop-[0-9]*.[0-9]*.pom diff --git a/0001-Main.patch b/0001-Main.patch index 6fc2193..5daaa4d 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Main diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index 85665d5..f400fc1 100644 +index a14d20c78..ef11c0839 100644 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java -@@ -210,11 +210,7 @@ public final class Main { +@@ -215,11 +215,7 @@ public final class Main { * @param args the command line parameters */ public static void main(String[] args) { @@ -19,4 +19,4 @@ index 85665d5..f400fc1 100644 + startFOP(args); } - } + /** diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index 0d4923d..fa3157b 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Use sRGB.icc color profile from colord package diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java -index 592bc88..cdbc7cf 100644 +index 704898def..1ce14cb4e 100644 --- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java @@ -22,7 +22,9 @@ package org.apache.fop.pdf; diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch index 5136fa2..c395e39 100644 --- a/0003-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Port to QDox 2.0 diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -index 5428cbb..fef4c2e 100644 +index 2351fc870..64cd7edf0 100644 --- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java @@ -21,6 +21,7 @@ package org.apache.fop.tools; diff --git a/changelog b/changelog new file mode 100644 index 0000000..c405ce0 --- /dev/null +++ b/changelog @@ -0,0 +1,329 @@ +* Wed Jul 19 2023 Fedora Release Engineering - 2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 27 2023 Tim Orling - 2.8-4 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 16 2022 Peter Lemenkov - 2.8-2 +- Build from cleaned up tarball + +* Wed Nov 16 2022 Peter Lemenkov - 2.8-1 +- Update to 2.8 + +* Thu Jul 21 2022 Fedora Release Engineering - 2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 2.7-3 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 2.7-2 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 27 2022 Peter Lemenkov - 2.7-1 +- Update to 2.7 + +* Thu Jan 20 2022 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 06 2021 Mat Booth - 2.6-3 +- Remove unnecessary BR on servlet + +* Thu Aug 26 2021 Peter Lemenkov - 2.6-2 +- Restore two patches + +* Wed Aug 25 2021 Orion Poplawski - 2.6-1 +- Update to 2.6, build with maven + +* Wed Jul 21 2021 Fedora Release Engineering - 2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 23 2020 Peter Lemenkov - 2.5-1 +- Ver. 2.5 + +* Sat Aug 01 2020 Fedora Release Engineering - 2.4-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 2.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Feb 21 2020 Peter Lemenkov - 2.4-1 +- Ver. 2.4 +- No nonger requires avalon framework + +* Tue Jan 28 2020 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 31 2018 Severin Gehwolf - 2.2-3 +- Add explicit javapackages-tools requirement since fop script + uses java-functions. See RHBZ#1600426. + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu May 17 2018 Peter Lemenkov - 2.2-1 +- Ver. 2.2 + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 25 2017 Mikolaj Izdebski - 2.0-8 +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495235 + +* Tue Sep 12 2017 Mikolaj Izdebski - 2.0-7 +- Add fontbox to classpath +- Resolves: rhbz#1413340 + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 2.0-4 +- Fix FTBFS + +* Wed Feb 03 2016 Fedora Release Engineering - 2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 07 2015 Michael Simacek - 2.0-2 +- Add fix for FOP-2461 (rhbz#1251173) + +* Tue Jul 14 2015 Michael Simacek - 2.0-1 +- Update to upstream version 2.0 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 1.1-10 +- Disable javadoc doclint + +* Tue Mar 17 2015 Michael Simacek - 1.1-9 +- Port to current QDox and xmlgraphics-commons + +* Mon Jun 16 2014 Michal Srb - 1.1-8 +- Fix FTBFS + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jan 2 2014 Richard Hughes 1.1-6 +- Drop the icc-profiles-openicc requirement and switch to using the colord sRGB + profile filename. +- Resolves: #1042655 + +* Thu Nov 7 2013 Krzysztof Daniel 1.1-5 +- Fix the OSGi manifest. + +* Wed Sep 18 2013 Michal Srb - 1.1-4 +- Fix license tag (Resolves: rhbz#979394) +- Add ASL 1.1 license text + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 21 2013 Michal Srb - 1.1-2 +- Build from clean tarball +- Spec file clean up + +* 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 + +* Sun Nov 18 2012 Mikolaj Izdebski - 1.0-20 +- Add xml-commons-apis-ext to classpath + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jun 21 2011 Rüdiger Landmann 1.0-16 +- Supply missing event-model.xml files + +* Fri Jun 3 2011 Rüdiger Landmann 1.0-15 +- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath + +* Thu Mar 10 2011 Alexander Kurtakov 1.0-14 +- Reapply Fedora guidelines. +- Re-add pom.xml to unbreak Maven stack. +- Re-add OSGi manifest to unbreak Eclipse stack. +- Remove all bundled jars and classes and fix the build to work with our libs. + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-13 +- reinstate updated manifest patch +- change define to global + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-12 +- buildarch: noarch + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-11 +- drop obsolete manifest patch + +* Thu Mar 10 2011 Rüdiger Landmann 1.0-10 +- import 1.0 into Fedora, based on Mandriva package + +* Tue Feb 08 2011 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 4 2011 Rüdiger Landmann - 1.0-8 +- BR qdox + +* Tue Jan 4 2011 Rüdiger Landmann - 1.0-7 +- set BR on xmlgraphics-commons >= 1.4 +- Add qdox classpath + +* Thu Dec 09 2010 Paulo Ricardo Zanoni 1.0-0.0.3mdv2011.0 +- Revision: 617684 +- Resubmit after moving + +* Fri Dec 3 2010 Stanislav Ochotnicky - 1.0-6 +- Add LICENSE to javadoc sub-package +- Few other tweaks according to new guidelines +- Make jars and javadoc versionless +- Add pom file (Resolves rhbz#655804) + +* Fri Oct 1 2010 Alexander Kurtakov 1.0-5 +- We need servlet not jsp. + +* Fri Oct 1 2010 Alexander Kurtakov 1.0-4 +- BR jsp. + +* Fri Oct 1 2010 Alexander Kurtakov 1.0-3 +- Add more BRs. + +* Fri Oct 1 2010 Alexander Kurtakov 1.0-2 +- BR ant-nodeps. + +* Fri Oct 1 2010 Alexander Kurtakov 1.0-1 +- Update to 1.0. +- BR/R java 1.6.0 not openjdk (rhbz#620330). +- Remove jars in prep. + +* Sat Sep 04 2010 Tomasz Pawel Gajc 1.0-0.0.2mdv2011.0 +- Revision: 576002 +- rebuild for new xmlgraphics-commons + +* Sun Aug 29 2010 Tomasz Pawel Gajc 1.0-0.0.1mdv2011.0 +- Revision: 574030 +- update to new version 1.0 +- disable patch 1 +- disable gcj support + +* Thu Apr 29 2010 Tomasz Pawel Gajc 0.95-0.0.3mdv2010.1 +- Revision: 540954 +- rebuild + +* Fri Sep 11 2009 Thierry Vignaud 0.95-0.0.2mdv2010.0 +- Revision: 437573 +- rebuild + +* Wed Dec 17 2008 Tomasz Pawel Gajc 0.95-0.0.1mdv2009.1 +- Revision: 315376 +- update to new version 0.95 +- drop patch0, not needed anymore +- spec file clean +- drop useles buildrequires +- use %%java_home + +* Sat Dec 29 2007 David Walluck 0.94-0.2.1mdv2008.1 +- Revision: 139372 +- spec cleanup +- import fop + + +* Fri Dec 7 2007 Lillian Angel - 0.94-2 +- Updated Release. + +* Thu Dec 6 2007 Lillian Angel - 0.94-1 +- Removed ppc/64 conditions since IcedTea is now available for ppc/64. + +* Tue Nov 27 2007 Lillian Angel - 0.94-1 +- Fixed to build with gcj on ppc/64. + +* Fri Nov 23 2007 Lillian Angel - 0.94-1 +- Fixed rpmlint errors. + +* Tue Sep 18 2007 Joshua Sumali - 0:0.94-1 +- Update to fop 0.94 + +* Thu Mar 30 2006 Ralph Apel - 0:0.20.5-9jpp +- First build for JPP-1.7 +- Replace avalon-framework, avalon-logkit with their new excalibur-* + counterparts +- Drop non-free jimi and jai BRs + +* Tue Oct 11 2005 Ralph Apel - 0:0.20.5-8jpp +- Patch to Batik >= 1.5.1 + +* Fri Oct 07 2005 Ralph Apel - 0:0.20.5-7jpp +- Omit ant -d flag + +* Mon Aug 23 2004 Ralph Apel - 0:0.20.5-6jpp +- Build with ant-1.6.2 + +* Fri Aug 06 2004 Ralph Apel - 0:0.20.5-5jpp +- Void change + +* Tue Jun 01 2004 Randy Watler - 0:0.20.5-4jpp +- Upgrade to Ant 1.6.X + +* Thu Jan 8 2004 Ville Skyttä - 0:0.20.5-3jpp +- BuildRequires ant-optional. +- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons. +- Add Main-Class back to manifest. + +* Tue Sep 23 2003 Paul Nasrat - 0:0.20.5-2jpp +- Fix script and requires +- Remove class path in manifest +- New javadoc style + +* Sat Jul 19 2003 Ville Skyttä - 0:0.20.5-1jpp +- Update to 0.20.5. +- Crosslink with xml-commons-apis and batik javadocs. +- BuildRequires jai, jce and jimi. + +* Sat Jun 7 2003 Ville Skyttä - 0:0.20.5-0.rc3a.1jpp +- Update to 0.20.5rc3a. +- Include fop script. +- Non-versioned javadoc symlinks. + +* Thu Apr 17 2003 Ville Skyttä - 0:0.20.5-0.rc2.1jpp +- Update to 0.20.5rc2 and JPackage 1.5. + +* Sun Mar 10 2002 Guillaume Rousse 0.20.3-1jpp +- 0.20.3 final +- fixed missing symlink + +* Mon Jan 21 2002 Guillaume Rousse 0.20.3-0.rc.1jpp +- 0.20.3rc +- first unified release +- javadoc into javadoc package +- no dependencies for manual package +- s/jPackage/JPackage +- adaptation to new xalan-j2 package +- requires and buildrequires avalon-logkit + +* Thu Aug 30 2001 Guillaume Rousse 0.20.1-1mdk +- first release diff --git a/fop.spec b/fop.spec index 78b0b44..ca68180 100644 --- a/fop.spec +++ b/fop.spec @@ -1,15 +1,22 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.8 -Release: 5%{?dist} +Version: 2.9 +Release: %autorelease # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources +# * Viewer_cs.properties +# * Viewer_fi.properties +# * Viewer_ja.properties +# * Viewer_pl.properties +# * Viewer_ru.properties +# * Viewer_tr.properties # rest is ASL 2.0 License: Apache-2.0 AND Apache-1.1 URL: https://xmlgraphics.apache.org/fop Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz -Source1: %{name}.script -Source2: batik-pdf-MANIFEST.MF +Source1: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz.asc +Source2: %{name}.script +Source3: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt Patch1: 0001-Main.patch Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -92,11 +99,11 @@ mkdir -p fop-events/target/test-classes %install %mvn_install # inject OSGi manifest -jar ufm %{buildroot}%{_javadir}/%{name}/%{name}.jar %{SOURCE2} +jar ufm %{buildroot}%{_javadir}/%{name}/%{name}.jar %{SOURCE3} # script install -d -m 755 %{buildroot}%{_bindir} -install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/fop +install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/fop # data install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf @@ -118,332 +125,4 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog -* Wed Jul 19 2023 Fedora Release Engineering - 2.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Feb 27 2023 Tim Orling - 2.8-4 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 16 2022 Peter Lemenkov - 2.8-2 -- Build from cleaned up tarball - -* Wed Nov 16 2022 Peter Lemenkov - 2.8-1 -- Update to 2.8 - -* Thu Jul 21 2022 Fedora Release Engineering - 2.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 2.7-3 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 2.7-2 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 27 2022 Peter Lemenkov - 2.7-1 -- Update to 2.7 - -* Thu Jan 20 2022 Fedora Release Engineering - 2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 06 2021 Mat Booth - 2.6-3 -- Remove unnecessary BR on servlet - -* Thu Aug 26 2021 Peter Lemenkov - 2.6-2 -- Restore two patches - -* Wed Aug 25 2021 Orion Poplawski - 2.6-1 -- Update to 2.6, build with maven - -* Wed Jul 21 2021 Fedora Release Engineering - 2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 23 2020 Peter Lemenkov - 2.5-1 -- Ver. 2.5 - -* Sat Aug 01 2020 Fedora Release Engineering - 2.4-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 2.4-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Feb 21 2020 Peter Lemenkov - 2.4-1 -- Ver. 2.4 -- No nonger requires avalon framework - -* Tue Jan 28 2020 Fedora Release Engineering - 2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 31 2018 Severin Gehwolf - 2.2-3 -- Add explicit javapackages-tools requirement since fop script - uses java-functions. See RHBZ#1600426. - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 17 2018 Peter Lemenkov - 2.2-1 -- Ver. 2.2 - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Mikolaj Izdebski - 2.0-8 -- Elimitate race condition when injecting JAR manifest -- Resolves: rhbz#1495235 - -* Tue Sep 12 2017 Mikolaj Izdebski - 2.0-7 -- Add fontbox to classpath -- Resolves: rhbz#1413340 - -* Wed Jul 26 2017 Fedora Release Engineering - 2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 2.0-4 -- Fix FTBFS - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Aug 07 2015 Michael Simacek - 2.0-2 -- Add fix for FOP-2461 (rhbz#1251173) - -* Tue Jul 14 2015 Michael Simacek - 2.0-1 -- Update to upstream version 2.0 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 1.1-10 -- Disable javadoc doclint - -* Tue Mar 17 2015 Michael Simacek - 1.1-9 -- Port to current QDox and xmlgraphics-commons - -* Mon Jun 16 2014 Michal Srb - 1.1-8 -- Fix FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jan 2 2014 Richard Hughes 1.1-6 -- Drop the icc-profiles-openicc requirement and switch to using the colord sRGB - profile filename. -- Resolves: #1042655 - -* Thu Nov 7 2013 Krzysztof Daniel 1.1-5 -- Fix the OSGi manifest. - -* Wed Sep 18 2013 Michal Srb - 1.1-4 -- Fix license tag (Resolves: rhbz#979394) -- Add ASL 1.1 license text - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 21 2013 Michal Srb - 1.1-2 -- Build from clean tarball -- Spec file clean up - -* 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 - -* Sun Nov 18 2012 Mikolaj Izdebski - 1.0-20 -- Add xml-commons-apis-ext to classpath - -* Thu Jul 19 2012 Fedora Release Engineering - 1.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Jun 21 2011 Rüdiger Landmann 1.0-16 -- Supply missing event-model.xml files - -* Fri Jun 3 2011 Rüdiger Landmann 1.0-15 -- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath - -* Thu Mar 10 2011 Alexander Kurtakov 1.0-14 -- Reapply Fedora guidelines. -- Re-add pom.xml to unbreak Maven stack. -- Re-add OSGi manifest to unbreak Eclipse stack. -- Remove all bundled jars and classes and fix the build to work with our libs. - -* Thu Mar 10 2011 Rüdiger Landmann 1.0-13 -- reinstate updated manifest patch -- change define to global - -* Thu Mar 10 2011 Rüdiger Landmann 1.0-12 -- buildarch: noarch - -* Thu Mar 10 2011 Rüdiger Landmann 1.0-11 -- drop obsolete manifest patch - -* Thu Mar 10 2011 Rüdiger Landmann 1.0-10 -- import 1.0 into Fedora, based on Mandriva package - -* Tue Feb 08 2011 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 4 2011 Rüdiger Landmann - 1.0-8 -- BR qdox - -* Tue Jan 4 2011 Rüdiger Landmann - 1.0-7 -- set BR on xmlgraphics-commons >= 1.4 -- Add qdox classpath - -* Thu Dec 09 2010 Paulo Ricardo Zanoni 1.0-0.0.3mdv2011.0 -- Revision: 617684 -- Resubmit after moving - -* Fri Dec 3 2010 Stanislav Ochotnicky - 1.0-6 -- Add LICENSE to javadoc sub-package -- Few other tweaks according to new guidelines -- Make jars and javadoc versionless -- Add pom file (Resolves rhbz#655804) - -* Fri Oct 1 2010 Alexander Kurtakov 1.0-5 -- We need servlet not jsp. - -* Fri Oct 1 2010 Alexander Kurtakov 1.0-4 -- BR jsp. - -* Fri Oct 1 2010 Alexander Kurtakov 1.0-3 -- Add more BRs. - -* Fri Oct 1 2010 Alexander Kurtakov 1.0-2 -- BR ant-nodeps. - -* Fri Oct 1 2010 Alexander Kurtakov 1.0-1 -- Update to 1.0. -- BR/R java 1.6.0 not openjdk (rhbz#620330). -- Remove jars in prep. - -* Sat Sep 04 2010 Tomasz Pawel Gajc 1.0-0.0.2mdv2011.0 -- Revision: 576002 -- rebuild for new xmlgraphics-commons - -* Sun Aug 29 2010 Tomasz Pawel Gajc 1.0-0.0.1mdv2011.0 -- Revision: 574030 -- update to new version 1.0 -- disable patch 1 -- disable gcj support - -* Thu Apr 29 2010 Tomasz Pawel Gajc 0.95-0.0.3mdv2010.1 -- Revision: 540954 -- rebuild - -* Fri Sep 11 2009 Thierry Vignaud 0.95-0.0.2mdv2010.0 -- Revision: 437573 -- rebuild - -* Wed Dec 17 2008 Tomasz Pawel Gajc 0.95-0.0.1mdv2009.1 -- Revision: 315376 -- update to new version 0.95 -- drop patch0, not needed anymore -- spec file clean -- drop useles buildrequires -- use %%java_home - -* Sat Dec 29 2007 David Walluck 0.94-0.2.1mdv2008.1 -- Revision: 139372 -- spec cleanup -- import fop - - -* Fri Dec 7 2007 Lillian Angel - 0.94-2 -- Updated Release. - -* Thu Dec 6 2007 Lillian Angel - 0.94-1 -- Removed ppc/64 conditions since IcedTea is now available for ppc/64. - -* Tue Nov 27 2007 Lillian Angel - 0.94-1 -- Fixed to build with gcj on ppc/64. - -* Fri Nov 23 2007 Lillian Angel - 0.94-1 -- Fixed rpmlint errors. - -* Tue Sep 18 2007 Joshua Sumali - 0:0.94-1 -- Update to fop 0.94 - -* Thu Mar 30 2006 Ralph Apel - 0:0.20.5-9jpp -- First build for JPP-1.7 -- Replace avalon-framework, avalon-logkit with their new excalibur-* - counterparts -- Drop non-free jimi and jai BRs - -* Tue Oct 11 2005 Ralph Apel - 0:0.20.5-8jpp -- Patch to Batik >= 1.5.1 - -* Fri Oct 07 2005 Ralph Apel - 0:0.20.5-7jpp -- Omit ant -d flag - -* Mon Aug 23 2004 Ralph Apel - 0:0.20.5-6jpp -- Build with ant-1.6.2 - -* Fri Aug 06 2004 Ralph Apel - 0:0.20.5-5jpp -- Void change - -* Tue Jun 01 2004 Randy Watler - 0:0.20.5-4jpp -- Upgrade to Ant 1.6.X - -* Thu Jan 8 2004 Ville Skyttä - 0:0.20.5-3jpp -- BuildRequires ant-optional. -- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons. -- Add Main-Class back to manifest. - -* Tue Sep 23 2003 Paul Nasrat - 0:0.20.5-2jpp -- Fix script and requires -- Remove class path in manifest -- New javadoc style - -* Sat Jul 19 2003 Ville Skyttä - 0:0.20.5-1jpp -- Update to 0.20.5. -- Crosslink with xml-commons-apis and batik javadocs. -- BuildRequires jai, jce and jimi. - -* Sat Jun 7 2003 Ville Skyttä - 0:0.20.5-0.rc3a.1jpp -- Update to 0.20.5rc3a. -- Include fop script. -- Non-versioned javadoc symlinks. - -* Thu Apr 17 2003 Ville Skyttä - 0:0.20.5-0.rc2.1jpp -- Update to 0.20.5rc2 and JPackage 1.5. - -* Sun Mar 10 2002 Guillaume Rousse 0.20.3-1jpp -- 0.20.3 final -- fixed missing symlink - -* Mon Jan 21 2002 Guillaume Rousse 0.20.3-0.rc.1jpp -- 0.20.3rc -- first unified release -- javadoc into javadoc package -- no dependencies for manual package -- s/jPackage/JPackage -- adaptation to new xalan-j2 package -- requires and buildrequires avalon-logkit - -* Thu Aug 30 2001 Guillaume Rousse 0.20.1-1mdk -- first release +%autochangelog diff --git a/sources b/sources index f6d3697..31b316a 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.8-src.tar.gz) = 965b16cbedb386a2d6b0a8005bba72aa4f14e92259e4889ce49892b4498372a90d57ae4d7bace7425058562b6d0020fd233a303ed2642bfdd2c897ea454f5337 +SHA512 (fop-2.9-src.tar.gz) = d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 +SHA512 (fop-2.9-src.tar.gz.asc) = 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc From bbb62c54f17a202b7347db3a95a60bf6b6a65f2c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 21 Oct 2023 00:43:37 +0200 Subject: [PATCH 56/73] Verify GPG signature Signed-off-by: Peter Lemenkov --- 5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg | Bin 0 -> 2229 bytes fop.spec | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg diff --git a/5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg b/5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg new file mode 100644 index 0000000000000000000000000000000000000000..7b805fcafca6aaef9bc3329520ee8cff56d07d1a GIT binary patch literal 2229 zcmV;m2uk;v0u2OJTxIJ45CFM8hp^{(qeU?}kzJ_SIR2(mW}yQSwfL^A#VI`wEdKQK z@EcxQf!#IoYtD+@92Q;6RJ&Koc9Aoq9=e;61ErP@_;48V z0x1!0s=|JZogB?{fzKc34}S9h-)uP&2HGL4O zYhA-rIgy7BiG^yz-ATL{ucV>$+WPVzU`e~&&9-jFVtQTU$Dn{eQ;2`J8<^CRG zFDqe%<}^#IET!Xys=B7nZzu{qVIx ztsh}cs8k@f3wwLmi zSKQN4LZPvabg$yC_B5)|)sb!OpzZ+gReZJGW zc5P-IlM_{`@?jLTsbr~gdm5S5JLq&Ev@YbJnVNaxG&0%kGD<;==F?-%B5H4YKh0r& z5hC?V06#4jJQ=96!)icQ5avWP#;rHdEks0_b)9lTkcwprm2dr`75YOySqFgQQU`(Z z*|QPTk%V!yCRc~S+ZGyfC~OTym~y=N^r0r>LCGGV2H&3$qt$`>O#z8OeNoo2kH30h z-ifOAlx`>cVdCLtt4^_`?v*Yz2nk+vr;Wma%<=AmzePBUAKH=QqQu%ZF^9-l-Bt5p_G- zGDLfTX40*(ro@AL`)?kRoqa_Gfr1CeB)Q+JVo+m za!lWP_7D_-;lDIBv(C1G$=KyD9+=WewFZ7jfSUbk!TFXN z=dDDM`GBxeS;E8Zm?r6+zxjGZrv)jrkz{p}!7%q^uuQo1Dqq`~kn4uk`%{s{ZG2J9 z-C! zI)`4FIu@J#Zueq0C%j?q-}8?zus=l zp@5@&>r&#JeBqxC3Yq+Uoy*2B^fs0y8P~~-FnLI|KH1zhPh__zGNdOJZo`m-XHX>E zhE+viRb4_`K1L^ZsjE1L0162ZTa)qM zeA{j67^)Bb8*+}(Im}5bce)zA61f&*ZFV0k>wEl{2=QwmpPG~~*MJac_B;RkrF@hG z#++(!BE=v;YG=we*%km^dll&scO(KMN=rb8p2jkzC5_{82H9fAZ13d7V*PlSa%3wY zKQ-8+U#EZIxR=V^OF0DWOUOJ2%3LyU&mAny>pz9OR`!tqMc;Q%`mPZ!fzX|BaP@QH zHC|Y%2M^Ow{mG7bzy~!ECLQp}$VM6)%XQkM-(rLyG}~8XnPVGp z-ziUV6)h5lM!rCUkHV>NyYEf0J3u3{aRVdOq3!0^G{fQ>skrxF;N2uZF}avb4F8sNSL5t>wnz8f<7@@3!&j>MM_&V4A1LXyvmTS~5XMt`2GqGB z#rGMsPA%?w5XUrf1+sA|7&fPGWehu69oc&Nk~W)h?gJos{yr0`z%6KO?@9!wmOG1) z?5$o}Go-41^cTFO8$C4w_o%xBaymG9^;c9h6~wYsI2UL9qqkL=nG zY>^Ira7FQ?HsaJE#^rz|&|cd>oB7yv91lYv2>CujKga%_W?x@XIzIrz_O$+ePqar@ zfFeN|6YUgzY5~Ey-iu#Xs+=+DQTfNot$y_f^qxmOfW(53Y7Y?i6Hu6|_Z1crkVhIy DCM6{d literal 0 HcmV?d00001 diff --git a/fop.spec b/fop.spec index ca68180..5c5320c 100644 --- a/fop.spec +++ b/fop.spec @@ -18,6 +18,7 @@ Source1: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-% Source2: %{name}.script Source3: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt +Source5: 5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg Patch1: 0001-Main.patch Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch3: 0003-Port-to-QDox-2.0.patch @@ -69,6 +70,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep +%{gpgverify} --keyring='%{SOURCE5}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 cp %{SOURCE4} LICENSE-1.1 From 1895a5a8e9c435fc1428f949ba08c1d541e77aff Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 21 Oct 2023 00:52:06 +0200 Subject: [PATCH 57/73] Missing BR Signed-off-by: Peter Lemenkov --- fop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fop.spec b/fop.spec index 5c5320c..a5a7cf1 100644 --- a/fop.spec +++ b/fop.spec @@ -37,6 +37,7 @@ BuildRequires: apache-commons-io BuildRequires: apache-commons-logging BuildRequires: batik BuildRequires: fontbox +BuildRequires: gnupg2 BuildRequires: javapackages-local BuildRequires: junit BuildRequires: maven-antrun-plugin From 128bad9de833342f0bccca503ef57210e9f53c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:38:57 +0000 Subject: [PATCH 58/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2b05493c8ede0abdee51ceb0b2ddbb7ec424314a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:54:13 +0000 Subject: [PATCH 59/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 03659578a3237497321c99764b2706516769db61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:29:20 +0100 Subject: [PATCH 60/73] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 From 4477872dcc1e9bdc772fa3e88d7ff764a2286b47 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 17 Jul 2024 16:07:08 +0200 Subject: [PATCH 61/73] Explicitly mark license files as %license Signed-off-by: Peter Lemenkov --- fop.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fop.spec b/fop.spec index a5a7cf1..5b578c4 100644 --- a/fop.spec +++ b/fop.spec @@ -118,13 +118,14 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%doc LICENSE LICENSE-1.1 README NOTICE +%doc README NOTICE +%license LICENSE LICENSE-1.1 %{_datadir}/%{name} %{_bindir}/fop %files javadoc %doc %{_javadocdir}/%{name} -%doc LICENSE LICENSE-1.1 +%license LICENSE LICENSE-1.1 %changelog From 9cf976b7978148632837d024deeafe207061803e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:28:59 +0000 Subject: [PATCH 62/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e640d3a33add6a171b428ab21a85552b1379f624 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 20 Jul 2024 02:54:27 -0300 Subject: [PATCH 63/73] added build-helper-maven-plugin to fix FTBFS --- fop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 5b578c4..b8f1255 100644 --- a/fop.spec +++ b/fop.spec @@ -44,7 +44,7 @@ BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-clean-plugin BuildRequires: maven-local -BuildRequires: maven-plugin-build-helper +BuildRequires: build-helper-maven-plugin BuildRequires: mvn(javax.servlet:servlet-api) # For servlet, not packaged #BuildRequires: maven-war-plugin From 82cb28429726cfc7588a94de45c2c54d55679537 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Oct 2024 18:07:29 +0300 Subject: [PATCH 64/73] Fop ver. 2.10 Signed-off-by: Peter Lemenkov --- fop.spec | 2 +- sources | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fop.spec b/fop.spec index b8f1255..4b35269 100644 --- a/fop.spec +++ b/fop.spec @@ -1,6 +1,6 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.9 +Version: 2.10 Release: %autorelease # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources diff --git a/sources b/sources index 31b316a..42f5328 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.9-src.tar.gz) = d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 -SHA512 (fop-2.9-src.tar.gz.asc) = 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc +SHA512 (fop-2.10-src.tar.gz) = c5ae25be3e3a4da01195e108dec66743ab6017967220db1f4e4300f79594d8144de23876eeac07b2068db75a60e1b25d10ddad48533bd0cd6cb9e110b519fcf6 +SHA512 (fop-2.10-src.tar.gz.asc) = ae9628cf9ca84d9c2ac1bfddcb4aec786985d3fdca16c2541e45690c81695ec5361dc1641a30572fc2d95defa69cab61a1992ab0d16843344411acb77835a73c From c44c4e4a7799fc967683c6516732be58a79287e5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 10 Oct 2024 14:48:40 +0300 Subject: [PATCH 65/73] Fix FTBFS Signed-off-by: Peter Lemenkov --- 0001-Main.patch | 4 ++-- 0003-Port-to-QDox-2.0.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/0001-Main.patch b/0001-Main.patch index 5daaa4d..86c7b33 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Main diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index a14d20c78..ef11c0839 100644 +index ca9443ade..53c936c88 100644 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java -@@ -215,11 +215,7 @@ public final class Main { +@@ -207,11 +207,7 @@ public final class Main { * @param args the command line parameters */ public static void main(String[] args) { diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch index c395e39..fe987eb 100644 --- a/0003-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -3,11 +3,11 @@ Date: Tue, 17 Mar 2015 10:59:41 +0100 Subject: [PATCH] Port to QDox 2.0 -diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -index 2351fc870..64cd7edf0 100644 ---- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -+++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -@@ -21,6 +21,7 @@ package org.apache.fop.tools; +diff --git a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java +index fc72ffc47..71204194d 100644 +--- a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java ++++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java +@@ -21,6 +21,7 @@ package org.apache.fop.eventtools; import java.io.File; import java.io.IOException; From d8f53f9fee60d15c70cef760c8ce9c42e5d905b9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 15:00:12 +0300 Subject: [PATCH 66/73] Revert "Fix FTBFS" This reverts commit c44c4e4a7799fc967683c6516732be58a79287e5. --- 0001-Main.patch | 4 ++-- 0003-Port-to-QDox-2.0.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/0001-Main.patch b/0001-Main.patch index 86c7b33..5daaa4d 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Main diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java -index ca9443ade..53c936c88 100644 +index a14d20c78..ef11c0839 100644 --- a/fop-core/src/main/java/org/apache/fop/cli/Main.java +++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java -@@ -207,11 +207,7 @@ public final class Main { +@@ -215,11 +215,7 @@ public final class Main { * @param args the command line parameters */ public static void main(String[] args) { diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch index fe987eb..c395e39 100644 --- a/0003-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -3,11 +3,11 @@ Date: Tue, 17 Mar 2015 10:59:41 +0100 Subject: [PATCH] Port to QDox 2.0 -diff --git a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java -index fc72ffc47..71204194d 100644 ---- a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java -+++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java -@@ -21,6 +21,7 @@ package org.apache.fop.eventtools; +diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +index 2351fc870..64cd7edf0 100644 +--- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java ++++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +@@ -21,6 +21,7 @@ package org.apache.fop.tools; import java.io.File; import java.io.IOException; From 8eb53570f64702916dde972700a4b8499099a270 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 14:57:54 +0300 Subject: [PATCH 67/73] Revert "Fop ver. 2.10" THis version requires org.bouncycastle:bcpkix-jdk15to18:jar:1.78.1 artifact which we don't have. This reverts commit 82cb28429726cfc7588a94de45c2c54d55679537. --- fop.spec | 2 +- sources | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fop.spec b/fop.spec index 4b35269..b8f1255 100644 --- a/fop.spec +++ b/fop.spec @@ -1,6 +1,6 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.10 +Version: 2.9 Release: %autorelease # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources diff --git a/sources b/sources index 42f5328..31b316a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.10-src.tar.gz) = c5ae25be3e3a4da01195e108dec66743ab6017967220db1f4e4300f79594d8144de23876eeac07b2068db75a60e1b25d10ddad48533bd0cd6cb9e110b519fcf6 -SHA512 (fop-2.10-src.tar.gz.asc) = ae9628cf9ca84d9c2ac1bfddcb4aec786985d3fdca16c2541e45690c81695ec5361dc1641a30572fc2d95defa69cab61a1992ab0d16843344411acb77835a73c +SHA512 (fop-2.9-src.tar.gz) = d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 +SHA512 (fop-2.9-src.tar.gz.asc) = 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc From 2ece8e4ca26c749297f4142f475e78c601055559 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:39:23 +0000 Subject: [PATCH 68/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ab8b78d3344d4b4db7b6178ac0310fd893c14f47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:42:50 +0000 Subject: [PATCH 69/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cacb104342b7b59d9c36c9d188bae401b810fb53 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 18:58:10 +0200 Subject: [PATCH 70/73] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- fop.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fop.spec b/fop.spec index b8f1255..a72475d 100644 --- a/fop.spec +++ b/fop.spec @@ -26,7 +26,7 @@ Patch3: 0003-Port-to-QDox-2.0.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Requires: java +Requires: java-25 Requires: xalan-j2 >= 2.7.0 Requires: xml-commons-apis >= 1.3.04 # Explicit requires for javapackages-tools since fop script @@ -38,12 +38,12 @@ BuildRequires: apache-commons-logging BuildRequires: batik BuildRequires: fontbox BuildRequires: gnupg2 -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: junit BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-clean-plugin -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: build-helper-maven-plugin BuildRequires: mvn(javax.servlet:servlet-api) # For servlet, not packaged From 9d522f84c97e557f7fbec72c032fd448582c81ac Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:56:55 +0200 Subject: [PATCH 71/73] Reset back to jdk21 --- fop.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fop.spec b/fop.spec index a72475d..8f0e360 100644 --- a/fop.spec +++ b/fop.spec @@ -26,7 +26,7 @@ Patch3: 0003-Port-to-QDox-2.0.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Requires: java-25 +Requires: java-21 Requires: xalan-j2 >= 2.7.0 Requires: xml-commons-apis >= 1.3.04 # Explicit requires for javapackages-tools since fop script @@ -38,7 +38,7 @@ BuildRequires: apache-commons-logging BuildRequires: batik BuildRequires: fontbox BuildRequires: gnupg2 -BuildRequires: javapackages-local-openjdk25 +BuildRequires: javapackages-local-openjdk21 BuildRequires: junit BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin From b80d40bef5abc51db3249a4dda9d3349baebf015 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 20:25:19 +0200 Subject: [PATCH 72/73] One more forgotten jdk25 call --- fop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fop.spec b/fop.spec index 8f0e360..1f53adb 100644 --- a/fop.spec +++ b/fop.spec @@ -43,7 +43,7 @@ BuildRequires: junit BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-clean-plugin -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local-openjdk21 BuildRequires: build-helper-maven-plugin BuildRequires: mvn(javax.servlet:servlet-api) # For servlet, not packaged From 569a3460ab8f74efb6a9b094c7e44da2ea0afd47 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 7 Jan 2026 16:27:45 +0100 Subject: [PATCH 73/73] Bumped to 2.11 --- 0003-Port-to-QDox-2.0.patch | 6 +++--- 0004-jdk25.patch | 23 +++++++++++++++++++++++ fop.spec | 13 +++++++++---- sources | 4 ++-- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 0004-jdk25.patch diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch index c395e39..1269980 100644 --- a/0003-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -3,10 +3,10 @@ Date: Tue, 17 Mar 2015 10:59:41 +0100 Subject: [PATCH] Port to QDox 2.0 -diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +diff --git a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java index 2351fc870..64cd7edf0 100644 ---- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java -+++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java +--- a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java ++++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java @@ -21,6 +21,7 @@ package org.apache.fop.tools; import java.io.File; diff --git a/0004-jdk25.patch b/0004-jdk25.patch new file mode 100644 index 0000000..ab57880 --- /dev/null +++ b/0004-jdk25.patch @@ -0,0 +1,23 @@ +--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java ++++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java +@@ -165,7 +165,7 @@ + } + + bout.write(encode(">>")); +- } catch (IOException ioe) { ++ } catch (Exception ioe) { + log.error("Ignored I/O exception", ioe); + } + byte[] bytes = bout.toByteArray(); +--- a/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java ++++ b/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java +@@ -263,7 +263,7 @@ + indexed.add(new PDFName("DeviceGray")); + try { + baout.write(blues); +- } catch (IOException e) { ++ } catch (Exception e) { + e.printStackTrace(); + } + } else { + diff --git a/fop.spec b/fop.spec index 1f53adb..e28f696 100644 --- a/fop.spec +++ b/fop.spec @@ -1,6 +1,6 @@ Name: fop Summary: XSL-driven print formatter -Version: 2.9 +Version: 2.11 Release: %autorelease # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources @@ -22,13 +22,15 @@ Source5: 5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg Patch1: 0001-Main.patch Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch3: 0003-Port-to-QDox-2.0.patch +Patch4: 0004-jdk25.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Requires: java-21 +Requires: java-25 Requires: xalan-j2 >= 2.7.0 Requires: xml-commons-apis >= 1.3.04 +BuildRequires: bouncycastle-pkix # Explicit requires for javapackages-tools since fop script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -38,14 +40,15 @@ BuildRequires: apache-commons-logging BuildRequires: batik BuildRequires: fontbox BuildRequires: gnupg2 -BuildRequires: javapackages-local-openjdk21 +BuildRequires: javapackages-local-openjdk25 BuildRequires: junit BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-clean-plugin -BuildRequires: maven-local-openjdk21 +BuildRequires: maven-local-openjdk25 BuildRequires: build-helper-maven-plugin BuildRequires: mvn(javax.servlet:servlet-api) +BuildRequires: bouncycastle-pkix # For servlet, not packaged #BuildRequires: maven-war-plugin BuildRequires: pdfbox @@ -80,6 +83,8 @@ rm -f fop/lib/*.jar fop/lib/build/*.jar # Not packaged %pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin +%pom_change_dep org.bouncycastle:bcpkix-jdk15to18:1.78.1 org.bouncycastle:bcpkix-jdk18on:1.83 fop-core +%pom_change_dep org.bouncycastle:bcprov-jdk15to18:1.78.1 org.bouncycastle:bcprov-jdk18on:1.83 fop-core %pom_remove_dep javax.media:jai-core fop-core %pom_remove_dep com.sun.media:jai-codec fop-core %pom_remove_dep net.sf.offo:fop-hyph fop-core diff --git a/sources b/sources index 31b316a..3fb9efc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121 -SHA512 (fop-2.9-src.tar.gz) = d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 -SHA512 (fop-2.9-src.tar.gz.asc) = 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc +SHA512 (fop-2.11-src.tar.gz) = 9eacdee6d81ecf5af02c6266d20f55642febfa10bc9f3754cfb4d1532743899759d6bc7d362e80f3a1d8d370c54485e455d0ca3eac8b6604a05d3326ffefa00c +SHA512 (fop-2.11-src.tar.gz.asc) = b6ec1565abc6386a08e77016b63ec3931f0c67ecb6f7135984c946a20e8bb4030f358270f21fce84614729ec40b48825f478e4cbc2b10972446bee36f5f8474f