15 changed files with 657 additions and 423 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,7 @@
 /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]*-src.tar.gz.asc
 /fop-[0-9]*.[0-9]*.pom
--- 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 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
-@@ -215,11 +215,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) {
@ -19,4 +19,4 @@ index a14d20c78..ef11c0839 100644
 +    	startFOP(args);
     }
 
-     /**
+ }
--- a/0003-Disable-javadoc-doclint.patch
+++ b/0003-Disable-javadoc-doclint.patch
@ -0,0 +1,17 @@
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+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">
+      <arg value="-Xdoclint:none"/>
+       <header><![CDATA[${name} ${version}]]></header>
+       <footer><![CDATA[${name} ${version}]]></footer>
+       <classpath>
--- a/0004-Port-to-QDox-2.0.patch
+++ b/0004-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/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/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/eventtools/EventProducerCollector.java
-+++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
+--- 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;
--- a/0004-jdk25.patch
+++ b/0004-jdk25.patch
@ -1,23 +0,0 @@
--- 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 {
-
--- a/0005-Allow-javascript-in-javadoc.patch
+++ b/0005-Allow-javascript-in-javadoc.patch
@ -0,0 +1,17 @@
+From: Michael Simacek <msimacek@redhat.com>
+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">
+       <arg value="-Xdoclint:none"/>
+      <arg value="--allow-script-in-comments"/>
+       <header><![CDATA[${name} ${version}]]></header>
+       <footer><![CDATA[${name} ${version}]]></footer>
+       <classpath>
--- a/0006-Revert-Fix-compile-on-newer-mvn.patch
+++ b/0006-Revert-Fix-compile-on-newer-mvn.patch
@ -0,0 +1,67 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+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.
+     <include name="xmlgraphics-commons*.jar"/>
+   </fileset>
+   <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
+-    <exec executable="mvn" dir="${basedir}/.." failonerror="true">
+    <exec executable="mvn" dir="${basedir}/..">
+       <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/>
+       <arg value="clean"/>
+       <arg value="install"/>
+diff --git a/pom.xml b/pom.xml
+index 3aac301c7..75eaed176 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -84,6 +84,8 @@
+           <configuration>
+             <source>${java.version}</source>
+             <target>${java.version}</target>
+            <executable>${jdk.path}/bin/javac</executable>
+            <fork>true</fork>
+           </configuration>
+         </plugin>
+         <plugin>
+@@ -105,34 +107,6 @@
+     </pluginManagement>
+   </build>
+ 
+-  <profiles>
+-    <profile>
+-      <id>custom-javac</id>
+-      <activation>
+-        <property>
+-          <name>jdk.path</name>
+-        </property>
+-      </activation>
+-      <build>
+-        <pluginManagement>
+-          <plugins>
+-            <plugin>
+-              <groupId>org.apache.maven.plugins</groupId>
+-              <artifactId>maven-compiler-plugin</artifactId>
+-              <version>${compiler.plugin.version}</version>
+-              <configuration>
+-                <source>${java.version}</source>
+-                <target>${java.version}</target>
+-                <executable>${jdk.path}/bin/javac</executable>
+-                <fork>true</fork>
+-              </configuration>
+-            </plugin>
+-          </plugins>
+-        </pluginManagement>
+-      </build>
+-    </profile>
+-  </profiles>
+-
+   <scm>
+     <connection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</connection>
+     <url>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</url>
--- a/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch
+++ b/0007-Revert-FOP-2895-Try-to-fix-Java-7.patch
@ -0,0 +1,18 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+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.
+   </fileset>
+   <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
+     <exec executable="mvn" dir="${basedir}/..">
+-      <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/>
+       <arg value="clean"/>
+       <arg value="install"/>
+       <arg value="-DskipTests"/>
--- a/0008-Revert-FOP-2895-Build-at-root.patch
+++ b/0008-Revert-FOP-2895-Build-at-root.patch
@ -0,0 +1,24 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+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.
+     <include name="xmlgraphics-commons*.jar"/>
+   </fileset>
+   <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
+-    <exec executable="mvn" dir="${basedir}/..">
+    <exec executable="mvn" dir="${basedir}/../fop-transcoder">
+      <arg value="clean"/>
+      <arg value="install"/>
+      <arg value="-DskipTests"/>
+    </exec>
+    <exec executable="mvn" dir="${basedir}/../fop-transcoder-allinone">
+       <arg value="clean"/>
+       <arg value="install"/>
+       <arg value="-DskipTests"/>
--- 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
@ -0,0 +1,165 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+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 @@
+           <include>org/apache/fop/util/ASCII*.class</include>
+           <include>org/apache/fop/util/AbstractPaintingState**</include>
+           <include>org/apache/fop/util/CMYKColorSpace*.class</include>
+-          <include>org/apache/fop/util/CharUtilities*.class</include>
+          <include>org/apache/fop/util/CharUtilities.class</include>
+           <include>org/apache/fop/util/Color*.class</include>
+           <include>org/apache/fop/util/DecimalFormatCache*.class</include>
+           <include>org/apache/fop/util/Finalizable.class</include>
+           <include>org/apache/fop/util/ImageObject.class</include>
+           <include>org/apache/fop/util/SubInputStream.class</include>
+-          <include>org/apache/fop/util/HexEncoder.class</include>
+-          <include>org/apache/fop/configuration/**</include>
+         </includes>
+         <excludes>
+           <exclude>org/apache/fop/render/pdf/PSRenderer.class</exclude>
+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.
+       </lib>
+     </war>
+   </target>
+  <patternset id="transcoder-classes">
+<!-- General classes -->
+    <patternset>
+      <include name="org/apache/fop/Version.class"/>
+      <include name="org/apache/fop/accessibility/StructureTreeElement.class"/>
+      <include name="org/apache/fop/apps/Fop.class"/>
+      <include name="org/apache/fop/apps/FOPException.class"/>
+      <include name="org/apache/fop/apps/io/**"/>
+      <include name="org/apache/fop/area/AreaTreeControl*"/>
+      <include name="org/apache/fop/complexscripts/bidi/BidiClass.class"/>
+      <include name="org/apache/fop/complexscripts/bidi/BidiConstants.class"/>
+      <include name="org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.class"/>
+      <include name="org/apache/fop/complexscripts/fonts/*.class"/>
+      <include name="org/apache/fop/complexscripts/util/GlyphTester.class"/>
+      <include name="org/apache/fop/events/EventProducer.class"/>
+      <include name="org/apache/fop/fo/Constants.class"/>
+      <include name="org/apache/fop/fo/FOTreeBuilder.class"/>
+      <include name="org/apache/fop/image/loader/batik/BatikImageFlavors*.class"/>
+      <include name="org/apache/fop/svg/**"/>
+      <include name="org/apache/fop/fonts/**"/>
+      <include name="org/apache/fop/render/gradient/**"/>
+      <include name="org/apache/fop/traits/Direction.class"/>
+      <include name="org/apache/fop/traits/MinOptMax.class"/>
+      <include name="org/apache/fop/traits/TraitEnum.class"/>
+      <include name="org/apache/fop/util/CMYKColorSpace*.class"/>
+      <include name="org/apache/fop/util/Color*.class"/>
+      <include name="org/apache/fop/util/ASCII*.class"/>
+      <include name="org/apache/fop/util/*OutputStream.class"/>
+      <include name="org/apache/fop/util/SubInputStream.class"/>
+      <include name="org/apache/fop/util/Finalizable.class"/>
+      <include name="org/apache/fop/util/CharUtilities*.class"/>
+      <include name="org/apache/fop/util/DecimalFormatCache*.class"/>
+      <include name="org/apache/fop/util/ImageObject.class"/>
+      <include name="org/apache/fop/util/HexEncoder.class"/>
+      <include name="org/apache/fop/configuration/**"/>
+    </patternset>
+<!-- PDF transcoder -->
+    <patternset>
+      <include name="org/apache/fop/render/pdf/**"/>
+      <exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
+      <exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
+      <include name="org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class"/>
+      <include name="org/apache/fop/render/**Config**"/>
+      <include name="org/apache/fop/util/AbstractPaintingState**"/>
+      <include name="org/apache/fop/pdf/**"/>
+    </patternset>
+<!-- PS transcoder -->
+    <patternset>
+      <include name="org/apache/fop/render/ps/**"/>
+      <exclude name="org/apache/fop/render/pdf/PSRenderer.class"/>
+      <exclude name="org/apache/fop/render/pdf/PSXMLHandler*"/>
+    </patternset>
+  </patternset>
+   <fileset dir="${build.classes.dir}" id="transcoder-classes-files">
+     <patternset refid="transcoder-classes"/>
+   </fileset>
+@@ -614,19 +667,60 @@ list of possible build targets.
+     <include name="commons-logging*.jar"/>
+     <include name="xmlgraphics-commons*.jar"/>
+   </fileset>
+-  <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
+-    <exec executable="mvn" dir="${basedir}/../fop-transcoder">
+-      <arg value="clean"/>
+-      <arg value="install"/>
+-      <arg value="-DskipTests"/>
+-    </exec>
+-    <exec executable="mvn" dir="${basedir}/../fop-transcoder-allinone">
+-      <arg value="clean"/>
+-      <arg value="install"/>
+-      <arg value="-DskipTests"/>
+-    </exec>
+-    <copy file="${basedir}/../fop-transcoder/target/fop-transcoder-${version}.jar" tofile="${build.dir}/fop-transcoder.jar"/>
+-    <copy file="${basedir}/../fop-transcoder-allinone/target/fop-transcoder-allinone-${version}.jar" tofile="${build.dir}/fop-transcoder-allinone.jar"/>
+  <target name="uptodate-transcoder-pkg" depends="compile">
+    <uptodate property="transcoder.pkg.uptodate" targetfile="${build.dir}/fop-transcoder.jar">
+      <srcfiles refid="transcoder-classes-files"/>
+      <srcfiles refid="transcoder-lib-files"/>
+    </uptodate>
+  </target>
+  <target name="transcoder-pkg" depends="remove-cache, uptodate-transcoder-pkg, compile" description="Generates the jar for the transcoder package for Batik" unless="transcoder.pkg.uptodate">
+    <echo message="Creating the jar file ${build.dir}/fop-transcoder.jar"/>
+    <property name="fop-transcoder.name" value="FOP Transcoder Package"/>
+    <property name="fop-transcoder.version" value="${version}"/>
+    <tstamp>
+      <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
+    </tstamp>
+<!-- lean transcoder jar -->
+    <jar jarfile="${build.dir}/fop-transcoder.jar">
+      <fileset refid="transcoder-classes-files"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+        <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+        <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+      </manifest>
+      <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
+    </jar>
+<!-- all-in-one transcoder jar -->
+    <property name="transcoder-deps" value="${build.dir}/transcoder-dependencies"/>
+    <mkdir dir="${transcoder-deps}"/>
+    <unjar dest="${transcoder-deps}">
+      <patternset>
+        <include name="org/apache/commons/logging/**"/>
+        <include name="org/apache/commons/io/*.class"/>
+        <include name="org/apache/commons/io/filefilter/*.class"/>
+        <include name="org/apache/commons/io/output/*.class"/>
+      </patternset>
+      <fileset refid="transcoder-lib-files"/>
+    </unjar>
+    <mkdir dir="${transcoder-deps}/legal"/>
+    <copy todir="${transcoder-deps}/legal">
+      <fileset dir="${lib.dir}">
+        <include name="commons-io.LICENSE.txt"/>
+        <include name="commons-logging.LICENSE.txt"/>
+      </fileset>
+    </copy>
+    <jar jarfile="${build.dir}/fop-transcoder-allinone.jar">
+      <fileset refid="transcoder-classes-files"/>
+      <fileset dir="${transcoder-deps}"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+        <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+        <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+      </manifest>
+      <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
+    </jar>
+   </target>
+   <target name="all" depends="package, servlet, transcoder-pkg, junit"/>
+ <!-- "all" target for us Makefile converts ;-) -->
--- a/5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg
+++ b/5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg
--- a/329
+++ b/329
@ -1,329 +0,0 @@
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 27 2023 Tim Orling <ticotimo@gmail.com> - 2.8-4
- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-2
- Build from cleaned up tarball
-
-* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-1
- Update to 2.8
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.7-3
- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.7-2
- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 27 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.7-1
- Update to 2.7
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec 06 2021 Mat Booth <mat.booth@gmail.com> - 2.6-3
- Remove unnecessary BR on servlet
-
-* Thu Aug 26 2021 Peter Lemenkov <lemenkov@gmail.com> - 2.6-2
- Restore two patches
-
-* Wed Aug 25 2021 Orion Poplawski <orion@nwra.com> - 2.6-1
- Update to 2.6, build with maven
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 23 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.5-1
- Ver. 2.5
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.4-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri Feb 21 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.4-1
- Ver. 2.4
- No nonger requires avalon framework
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.2-3
- Add explicit javapackages-tools requirement since fop script
-  uses java-functions. See RHBZ#1600426.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 17 2018 Peter Lemenkov <lemenkov@gmail.com> - 2.2-1
- Ver. 2.2
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-8
- Elimitate race condition when injecting JAR manifest
- Resolves: rhbz#1495235
-
-* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
- Add fontbox to classpath
- Resolves: rhbz#1413340
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 2.0-4
- Fix FTBFS
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Aug 07 2015 Michael Simacek <msimacek@redhat.com> - 2.0-2
- Add fix for FOP-2461 (rhbz#1251173)
-
-* Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 2.0-1
- Update to upstream version 2.0
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-10
- Disable javadoc doclint
-
-* Tue Mar 17 2015 Michael Simacek <msimacek@redhat.com> - 1.1-9
- Port to current QDox and xmlgraphics-commons
-
-* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 1.1-8
- Fix FTBFS
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Jan 2 2014 Richard Hughes <rhughes@redhat.com> 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 <kdaniel@redhat.com> 1.1-5
- Fix the OSGi manifest.
-
-* Wed Sep 18 2013 Michal Srb <msrb@redhat.com> - 1.1-4
- Fix license tag (Resolves: rhbz#979394)
- Add ASL 1.1 license text
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jun 21 2013 Michal Srb <msrb@redhat.com> - 1.1-2
- Build from clean tarball
- Spec file clean up
-
-* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Nov 18 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-20
- Add xml-commons-apis-ext to classpath
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Jun 21 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-16
- Supply missing event-model.xml files
-
-* Fri Jun 3 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-15
- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath
-
-* Thu Mar 10 2011 Alexander Kurtakov <akurtako@redhat.com> 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 <r.landmann@redhat.com> 1.0-13
- reinstate updated manifest patch
- change define to global
-
-* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-12
- buildarch: noarch
-
-* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-11
- drop obsolete manifest patch
-
-* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-10
- import 1.0 into Fedora, based on Mandriva package
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-8
- BR qdox
-
-* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-7
- set BR on xmlgraphics-commons >= 1.4
- Add qdox classpath
-
-* Thu Dec 09 2010 Paulo Ricardo Zanoni <pzanoni@mandriva.com> 1.0-0.0.3mdv2011.0
- Revision: 617684
- Resubmit after moving
-
-* Fri Dec 3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <akurtako@redhat.com> 1.0-5
- We need servlet not jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-4
- BR jsp.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-3
- Add more BRs.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-2
- BR ant-nodeps.
-
-* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 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 <tpg@mandriva.org> 1.0-0.0.2mdv2011.0
- Revision: 576002
- rebuild for new xmlgraphics-commons
-
-* Sun Aug 29 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 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 <tpg@mandriva.org> 0.95-0.0.3mdv2010.1
- Revision: 540954
- rebuild
-
-* Fri Sep 11 2009 Thierry Vignaud <tv@mandriva.org> 0.95-0.0.2mdv2010.0
- Revision: 437573
- rebuild
-
-* Wed Dec 17 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 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 <walluck@mandriva.org> 0.94-0.2.1mdv2008.1
- Revision: 139372
- spec cleanup
- import fop
-
-
-* Fri Dec  7 2007 Lillian Angel <langel at redhat.com> - 0.94-2
- Updated Release.
-
-* Thu Dec  6 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Removed ppc/64 conditions since IcedTea is now available for ppc/64.
-
-* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed to build with gcj on ppc/64.
-
-* Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed rpmlint errors.
-
-* Tue Sep 18 2007 Joshua Sumali <jsumali at redhat.com> - 0:0.94-1
- Update to fop 0.94
-
-* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 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 <r.apel at r-apel.de> - 0:0.20.5-8jpp
- Patch to Batik >= 1.5.1
-
-* Fri Oct 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-7jpp
- Omit ant -d flag
-
-* Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-6jpp
- Build with ant-1.6.2
-
-* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-5jpp
- Void change
-
-* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.20.5-4jpp
- Upgrade to Ant 1.6.X
-
-* Thu Jan  8 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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 <pauln at truemesh.com> - 0:0.20.5-2jpp
- Fix script and requires
- Remove class path in manifest
- New javadoc style
-
-* Sat Jul 19 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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Ã¤ <ville.skytta at iki.fi> - 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Ã¤ <ville.skytta at iki.fi> - 0:0.20.5-0.rc2.1jpp
- Update to 0.20.5rc2 and JPackage 1.5.
-
-* Sun Mar 10 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 0.20.3-1jpp
- 0.20.3 final
- fixed missing symlink
-
-* Mon Jan 21 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 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 <guillomovitch@users.sourceforge.net> 0.20.1-1mdk
- first release
--- a/clean-tarball.sh
+++ b/clean-tarball.sh
@ -13,6 +13,8 @@ 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
--- a/fop.spec
+++ b/fop.spec
@ -1,62 +1,53 @@
 Name:           fop
 Summary:        XSL-driven print formatter
-Version:        2.11
-Release:        %autorelease
+Version:        2.5
+Release:        1%{?dist}
 # 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
+License:        ASL 2.0 and ASL 1.1
 URL:            https://xmlgraphics.apache.org/fop
 Source0:        https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz
-Source1:        https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz.asc
-Source2:        %{name}.script
-Source3:        batik-pdf-MANIFEST.MF
+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
-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
+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
-ExclusiveArch:  %{java_arches} noarch

-Requires:       java-25
+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
-BuildRequires:  bouncycastle-pkix
+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:  gnupg2
-BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  javapackages-local
 BuildRequires:  junit
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-clean-plugin
-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
 BuildRequires:  qdox
-BuildRequires:  xml-maven-plugin
-BuildRequires:  xmlgraphics-commons >= 2.8
+BuildRequires:  servlet
+BuildRequires:  xmlgraphics-commons >= 1.5
 BuildRequires:  xmlunit
-BuildRequires:  xmlunit-assertj
 BuildRequires:  xmlunit-core

 %description
@ -74,44 +65,39 @@ Summary:        Javadoc for %{name}
 Javadoc for %{name}.

 %prep
-%{gpgverify} --keyring='%{SOURCE5}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1

 cp %{SOURCE4} LICENSE-1.1

 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
-%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
-
+#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

 %build
-# Skip tests for now, make dirs needed by build but created by tests
-mkdir -p fop-events/target/test-classes
-%mvn_build -f
-
+#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

 %install
-%mvn_install
 # inject OSGi manifest
-jar ufm %{buildroot}%{_javadir}/%{name}/%{name}.jar %{SOURCE3}
+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

 # script
 install -d -m 755 %{buildroot}%{_bindir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/fop
+install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/fop

 # data
 install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf
@ -119,19 +105,307 @@ cp -rp fop/conf/* %{buildroot}%{_datadir}/%{name}/conf

 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/xmvn-apidocs/* %{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


 %files -f .mfiles
-%doc README NOTICE
-%license LICENSE LICENSE-1.1
+%doc LICENSE LICENSE-1.1 README NOTICE
 %{_datadir}/%{name}
+%{_javadir}/pdf-transcoder.jar
 %{_bindir}/fop

 %files javadoc
 %doc %{_javadocdir}/%{name}
-%license LICENSE LICENSE-1.1
+%doc LICENSE LICENSE-1.1


 %changelog
-%autochangelog
+* Mon Nov 23 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.5-1
+- Ver. 2.5
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.4-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Feb 21 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.4-1
+- Ver. 2.4
+- No nonger requires avalon framework
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.2-3
+- Add explicit javapackages-tools requirement since fop script
+  uses java-functions. See RHBZ#1600426.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 17 2018 Peter Lemenkov <lemenkov@gmail.com> - 2.2-1
+- Ver. 2.2
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-8
+- Elimitate race condition when injecting JAR manifest
+- Resolves: rhbz#1495235
+
+* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
+- Add fontbox to classpath
+- Resolves: rhbz#1413340
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 2.0-4
+- Fix FTBFS
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Aug 07 2015 Michael Simacek <msimacek@redhat.com> - 2.0-2
+- Add fix for FOP-2461 (rhbz#1251173)
+
+* Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 2.0-1
+- Update to upstream version 2.0
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-10
+- Disable javadoc doclint
+
+* Tue Mar 17 2015 Michael Simacek <msimacek@redhat.com> - 1.1-9
+- Port to current QDox and xmlgraphics-commons
+
+* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 1.1-8
+- Fix FTBFS
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jan 2 2014 Richard Hughes <rhughes@redhat.com> 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 <kdaniel@redhat.com> 1.1-5
+- Fix the OSGi manifest.
+
+* Wed Sep 18 2013 Michal Srb <msrb@redhat.com> - 1.1-4
+- Fix license tag (Resolves: rhbz#979394)
+- Add ASL 1.1 license text
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Jun 21 2013 Michal Srb <msrb@redhat.com> - 1.1-2
+- Build from clean tarball
+- Spec file clean up
+
+* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Nov 18 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-20
+- Add xml-commons-apis-ext to classpath
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jun 21 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-16
+- Supply missing event-model.xml files
+
+* Fri Jun 3 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-15
+- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath
+
+* Thu Mar 10 2011 Alexander Kurtakov <akurtako@redhat.com> 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 <r.landmann@redhat.com> 1.0-13
+- reinstate updated manifest patch
+- change define to global
+
+* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-12
+- buildarch: noarch
+
+* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-11
+- drop obsolete manifest patch
+
+* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-10
+- import 1.0 into Fedora, based on Mandriva package
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-8
+- BR qdox
+
+* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-7
+- set BR on xmlgraphics-commons >= 1.4
+- Add qdox classpath
+
+* Thu Dec 09 2010 Paulo Ricardo Zanoni <pzanoni@mandriva.com> 1.0-0.0.3mdv2011.0
+- Revision: 617684
+- Resubmit after moving
+
+* Fri Dec 3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <akurtako@redhat.com> 1.0-5
+- We need servlet not jsp.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-4
+- BR jsp.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-3
+- Add more BRs.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-2
+- BR ant-nodeps.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 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 <tpg@mandriva.org> 1.0-0.0.2mdv2011.0
+- Revision: 576002
+- rebuild for new xmlgraphics-commons
+
+* Sun Aug 29 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 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 <tpg@mandriva.org> 0.95-0.0.3mdv2010.1
+- Revision: 540954
+- rebuild
+
+* Fri Sep 11 2009 Thierry Vignaud <tv@mandriva.org> 0.95-0.0.2mdv2010.0
+- Revision: 437573
+- rebuild
+
+* Wed Dec 17 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 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 <walluck@mandriva.org> 0.94-0.2.1mdv2008.1
+- Revision: 139372
+- spec cleanup
+- import fop
+
+
+* Fri Dec  7 2007 Lillian Angel <langel at redhat.com> - 0.94-2
+- Updated Release.
+
+* Thu Dec  6 2007 Lillian Angel <langel at redhat.com> - 0.94-1
+- Removed ppc/64 conditions since IcedTea is now available for ppc/64.
+
+* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
+- Fixed to build with gcj on ppc/64.
+
+* Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
+- Fixed rpmlint errors.
+
+* Tue Sep 18 2007 Joshua Sumali <jsumali at redhat.com> - 0:0.94-1
+- Update to fop 0.94
+
+* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 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 <r.apel at r-apel.de> - 0:0.20.5-8jpp
+- Patch to Batik >= 1.5.1
+
+* Fri Oct 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-7jpp
+- Omit ant -d flag
+
+* Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-6jpp
+- Build with ant-1.6.2
+
+* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-5jpp
+- Void change
+
+* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.20.5-4jpp
+- Upgrade to Ant 1.6.X
+
+* Thu Jan  8 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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 <pauln at truemesh.com> - 0:0.20.5-2jpp
+- Fix script and requires
+- Remove class path in manifest
+- New javadoc style
+
+* Sat Jul 19 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 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Ã¤ <ville.skytta at iki.fi> - 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Ã¤ <ville.skytta at iki.fi> - 0:0.20.5-0.rc2.1jpp
+- Update to 0.20.5rc2 and JPackage 1.5.
+
+* Sun Mar 10 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 0.20.3-1jpp
+- 0.20.3 final
+- fixed missing symlink
+
+* Mon Jan 21 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 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 <guillomovitch@users.sourceforge.net> 0.20.1-1mdk
+- first release
--- a/4
+++ b/4
@ -1,3 +1,3 @@
 SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121
-SHA512 (fop-2.11-src.tar.gz) = 9eacdee6d81ecf5af02c6266d20f55642febfa10bc9f3754cfb4d1532743899759d6bc7d362e80f3a1d8d370c54485e455d0ca3eac8b6604a05d3326ffefa00c
-SHA512 (fop-2.11-src.tar.gz.asc) = b6ec1565abc6386a08e77016b63ec3931f0c67ecb6f7135984c946a20e8bb4030f358270f21fce84614729ec40b48825f478e4cbc2b10972446bee36f5f8474f
+SHA512 (fop-2.5-src.tar.gz) = 313e286e67af6d48fa3caed5e07b493a0d5113c428f78871e9098c2d699aa0ff24a8e019bf259e0b6a4290fc384796ed30fd5260cb8a2a6c3660f5ea65c51adb
+SHA512 (fop-2.5.pom) = ae3239208414dfd3768b4f8af26b81b81c9d7ede1a9030907aed7a8c0c6756e0a116b36c2aeae01e29cc0767772ca28df4ba00894c67a218c78f9341cefacef2