From 885cb655f8eefa5a064e60370cc368e695146f68 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 17:37:36 +0100 Subject: [PATCH 1/7] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 From 586871d937a480ff17bdbb8c2352a6ca28f5a9dd Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:29:20 +0100 Subject: [PATCH 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 0e5fab9e6915c9962a9a0f6d6359d7e1d333c874 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Oct 2024 14:57:54 +0300 Subject: [PATCH 7/7] 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