From bfcc955974f17619b553a8cfcda74a189ffee60f Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 28 Jun 2023 10:22:41 +0200 Subject: [PATCH] Unretirement request: https://pagure.io/releng/issue/11503 --- .gitignore | 1 + dead.package | 1 - ...-engine-0.9.4-remove-commons-logging.patch | 101 +++++++++++ pentaho-reporting-flow-engine.spec | 169 ++++++++++++++++++ sources | 1 + 5 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch create mode 100644 pentaho-reporting-flow-engine.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f5bd17e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +flow-engine-0.9.4.zip diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch b/pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch new file mode 100644 index 0000000..80029e4 --- /dev/null +++ b/pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch @@ -0,0 +1,101 @@ +diff -ru pentaho-reporting-flow-engine-0.9.4.orig/source/org/jfree/report/JFreeReportBoot.java pentaho-reporting-flow-engine-0.9.4/source/org/jfree/report/JFreeReportBoot.java +--- pentaho-reporting-flow-engine-0.9.4.orig/source/org/jfree/report/JFreeReportBoot.java 2021-04-07 12:09:46.917336778 +0100 ++++ pentaho-reporting-flow-engine-0.9.4/source/org/jfree/report/JFreeReportBoot.java 2021-04-07 12:12:04.794062296 +0100 +@@ -42,8 +42,7 @@ + import org.pentaho.reporting.libraries.base.boot.PackageManager; + import org.pentaho.reporting.libraries.base.versioning.ProjectInformation; + import org.pentaho.reporting.libraries.base.LibBaseBoot; +-import org.apache.commons.logging.LogFactory; +-import org.apache.commons.logging.Log; ++import java.util.logging.Logger; + + /** + * An utility class to safely boot and initialize the JFreeReport library. This class +@@ -66,7 +65,7 @@ + */ + public class JFreeReportBoot extends AbstractBoot + { +- private static final Log logger = LogFactory.getLog(JFreeReportBoot.class); ++ private static final Logger logger = Logger.getLogger(JFreeReportBoot.class.getName()); + + /** + * A wrappper around the user supplied global configuration. +@@ -292,12 +291,12 @@ + // make sure logging is re-initialized after we injected our configuration. + if (isStrictFP() == false) + { +- logger.warn("The used VM seems to use a non-strict floating point arithmetics"); +- logger.warn("Layouts computed with this Java Virtual Maschine may be invalid."); +- logger.warn("JFreeReport and the library 'iText' depend on the strict floating point rules"); +- logger.warn("of Java1.1 as implemented by the Sun Virtual Maschines."); +- logger.warn("If you are using the BEA JRockit VM, start the Java VM with the option"); +- logger.warn("'-Xstrictfp' to restore the default behaviour."); ++ logger.warning("The used VM seems to use a non-strict floating point arithmetics"); ++ logger.warning("Layouts computed with this Java Virtual Maschine may be invalid."); ++ logger.warning("JFreeReport and the library 'iText' depend on the strict floating point rules"); ++ logger.warning("of Java1.1 as implemented by the Sun Virtual Maschines."); ++ logger.warning("If you are using the BEA JRockit VM, start the Java VM with the option"); ++ logger.warning("'-Xstrictfp' to restore the default behaviour."); + } + + final PackageManager mgr = getPackageManager(); +@@ -338,8 +337,8 @@ + } + catch (Exception se) + { +- logger.error +- ("An error occured while checking the system properties for extension modules.", se); ++ logger.severe ++ ("An error occured while checking the system properties for extension modules: " + se); + } + } + +diff -ru pentaho-reporting-flow-engine-0.9.4.orig/source/org/jfree/report/util/ComponentDrawable.java pentaho-reporting-flow-engine-0.9.4/source/org/jfree/report/util/ComponentDrawable.java +--- pentaho-reporting-flow-engine-0.9.4.orig/source/org/jfree/report/util/ComponentDrawable.java 2021-04-07 12:09:46.916336765 +0100 ++++ pentaho-reporting-flow-engine-0.9.4/source/org/jfree/report/util/ComponentDrawable.java 2021-04-07 12:11:25.530570919 +0100 +@@ -42,8 +42,7 @@ + import javax.swing.RepaintManager; + import javax.swing.SwingUtilities; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 11.10.2005, 14:03:15 +@@ -52,7 +51,7 @@ + */ + public class ComponentDrawable + { +- private static final Log logger = LogFactory.getLog (ComponentDrawable.class); ++ private static final Logger logger = Logger.getLogger(ComponentDrawable.class.getName()); + + /** + * A runnable that executes the drawing operation on the event-dispatcher thread. +@@ -443,7 +442,7 @@ + } + catch (Exception e) + { +- ComponentDrawable.logger.warn("Failed to compute the preferred size."); ++ ComponentDrawable.logger.warning("Failed to compute the preferred size."); + } + return new Dimension(0, 0); + } +@@ -475,7 +474,7 @@ + } + catch (Exception e) + { +- ComponentDrawable.logger.warn("Failed to compute the defined size."); ++ ComponentDrawable.logger.warning("Failed to compute the defined size."); + } + return new Dimension(0, 0); + } +@@ -563,7 +562,7 @@ + } + catch (Exception e) + { +- ComponentDrawable.logger.warn("Failed to redraw the component."); ++ ComponentDrawable.logger.warning("Failed to redraw the component."); + } + } + } diff --git a/pentaho-reporting-flow-engine.spec b/pentaho-reporting-flow-engine.spec new file mode 100644 index 0000000..a4eb6c3 --- /dev/null +++ b/pentaho-reporting-flow-engine.spec @@ -0,0 +1,169 @@ +Name: pentaho-reporting-flow-engine +Version: 0.9.4 +Release: 30%{?dist} +Summary: Pentaho Flow Reporting Engine +License: LGPL-2.1-or-later +Epoch: 1 +Source: http://downloads.sourceforge.net/jfreereport/flow-engine-%{version}.zip +URL: http://reporting.pentaho.org/ +BuildRequires: ant, java-devel, jpackage-utils, libbase, libserializer +BuildRequires: libloader, libfonts, pentaho-libxml, xml-commons-apis +BuildRequires: librepository, sac, flute, liblayout, libformula +Requires: java-headless, jpackage-utils, libbase >= 1.1.3, libfonts >= 1.1.3 +Requires: pentaho-libxml, libformula >= 1.1.3, librepository >= 1.1.3 +Requires: sac, flute, liblayout >= 0.2.10, libserializer +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch +Patch0: pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch + +%description +Pentaho Reporting Flow Engine is a free Java report library, formerly +known as 'JFreeReport' + +%package javadoc +Summary: Javadoc for %{name} +Requires: %{name} = 1:%{version}-%{release} +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -c +%patch0 -p1 -b .no_commons_logging +mkdir -p lib +find . -name "*.jar" -exec rm -f {} \; +build-jar-repository -s -p lib libbase libloader \ + libfonts libxml jaxp libformula librepository sac flute liblayout \ + libserializer + +%build +ant jar javadoc + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p build/lib/flow-engine.jar $RPM_BUILD_ROOT%{_javadir}/flow-engine.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%doc licence-LGPL.txt README.txt ChangeLog.txt +%{_javadir}/*.jar + +%files javadoc +%{_javadocdir}/%{name} + +%changelog +* Fri Feb 24 2023 Caolán McNamara - 1:0.9.4-30 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1:0.9.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1:0.9.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1:0.9.4-27 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1:0.9.4-26 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:0.9.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1:0.9.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Apr 07 2021 Caolán McNamara - 1:0.9.4-23 +- Related: rhbz#1895921 replace apache-commons-logging with java.util.logging + +* Tue Jan 26 2021 Fedora Release Engineering - 1:0.9.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:0.9.4-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1:0.9.4-20 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1:0.9.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 1:0.9.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1:0.9.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:0.9.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1:0.9.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1:0.9.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1:0.9.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:0.9.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 1:0.9.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1:0.9.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 25 2014 Caolán McNamara 1:0.9.4-9 +- Resolves: rhbz#1068477 Switch to java-headless (build)requires + +* Sat Aug 03 2013 Fedora Release Engineering - 1:0.9.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1:0.9.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 1:0.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1:0.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Caolán McNamara 1:0.9.4-4 +- Related: rhbz#749103 drop gcj aot + +* Tue Feb 08 2011 Fedora Release Engineering - 1:0.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 02 2010 Caolán McNamara 0.9.4-2 +- rebuild against libserializer + +* Thu Dec 03 2009 Caolán McNamara 0.9.4-1 +- latest version + +* Fri Jul 24 2009 Caolán McNamara 0.9.2-5.OOo31 +- make javadoc no-arch when building as arch-dependant aot + +* Sun Mar 29 2009 Caolán McNamara 0.9.2-4.OOo31 +- wrong num + +* Sat Mar 28 2009 Caolán McNamara 0.9.2-3.OOo31 +- tweak version + +* Mon Mar 16 2009 Caolán McNamara 0.9.2-1 +- OOo tuned version + +* Thu Feb 26 2009 Fedora Release Engineering - 0.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Sep 05 2008 Caolán McNamara 0.9.3-2 +- wrong liblayout version required + +* Wed May 07 2008 Caolán McNamara 0.9.3-1 +- initial fedora import diff --git a/sources b/sources new file mode 100644 index 0000000..de34481 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +ba2930200c9f019c2d93a8c88c651a0f flow-engine-0.9.4.zip