From 03659578a3237497321c99764b2706516769db61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:29:20 +0100 Subject: [PATCH 01/21] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 From 885cb655f8eefa5a064e60370cc368e695146f68 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 17:37:36 +0100 Subject: [PATCH 02/21] 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 03/21] 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 04/21] 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 05/21] 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 06/21] 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 586871d937a480ff17bdbb8c2352a6ca28f5a9dd Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:29:20 +0100 Subject: [PATCH 07/21] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 From ae6a664c5f8c9a70afd67b02aefab7ff1048062f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 17 Jul 2024 16:07:08 +0200 Subject: [PATCH 08/21] 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 d0bbaf213ec415580430d4e58b71c7d32ed3be0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:28:59 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c7bcec9fc11ebfa599162991bfcbb6c899d8a1fb Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 20 Jul 2024 02:54:27 -0300 Subject: [PATCH 10/21] 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 7074f1ece5b9b06498742a69a5f90113811bb97a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Oct 2024 18:07:29 +0300 Subject: [PATCH 11/21] 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 12/21] 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 13/21] 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 14/21] 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 0e5fab9e6915c9962a9a0f6d6359d7e1d333c874 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 14:57:54 +0300 Subject: [PATCH 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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