From 5cc39166ad3abfa279b71cf170ca4889d970c87a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 7 Dec 2022 16:14:54 +0100 Subject: [PATCH 01/23] 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 02/23] 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 03/23] 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 04/23] 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 05/23] 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 06/23] 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 07/23] 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 08/23] 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 09/23] 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 10/23] 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 11/23] 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 12/23] 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 13/23] 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 14/23] 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 15/23] 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 16/23] 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 17/23] 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 18/23] 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 19/23] 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 20/23] 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 21/23] 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 22/23] 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 23/23] 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