diff --git a/java-pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch b/java-pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch new file mode 100644 index 0000000..80029e4 --- /dev/null +++ b/java-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/java-pentaho-reporting-flow-engine.spec b/java-pentaho-reporting-flow-engine.spec index fbbed01..9e2f844 100644 --- a/java-pentaho-reporting-flow-engine.spec +++ b/java-pentaho-reporting-flow-engine.spec @@ -1,27 +1,21 @@ -%define with_gcj 1 %define javahome %{_jvmdir}/jdk Name: java-pentaho-reporting-flow-engine Version: 0.9.4 -Release: 1mamba +Release: 2mamba Summary: Pentaho Flow Reporting Engine Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://reporting.pentaho.org/ -Source: http://downloads.sourceforge.net/project/jfreereport/10.%20Flow%20Engine/0.9.4/flow-engine-0.9.4.zip +URL: https://sourceforge.net/projects/jfreereport/ +Source: http://downloads.sourceforge.net/project/jfreereport/10.%20Flow%20Engine/%{version}/flow-engine-%{version}.zip +Patch0: java-pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch License: LGPL ## AUTOBUILDREQ-BEGIN -BuildRequires: glibc-devel -BuildRequires: java-gcj-compat -BuildRequires: libgcc -BuildRequires: libgcj4-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: javapackages BuildRequires: apache-ant -BuildRequires: jakarta-commons-logging BuildRequires: java-flute -#BuildRequires: java-jcommon-serializer BuildRequires: java-jfree-libbase BuildRequires: java-jfree-libfonts BuildRequires: java-jfree-liblayout @@ -30,11 +24,7 @@ BuildRequires: java-jfree-libformula BuildRequires: java-jfree-libserializer BuildRequires: java-sac BuildRequires: java-jfree-libloader -BuildRequires: java-junit3 BuildRequires: java-pentaho-libxml -BuildRequires: jpackage-utils -BuildRequires: xml-commons-apis -Requires: jakarta-commons-logging Requires: java-flute Requires: java-jfree-libbase Requires: java-jfree-libfonts @@ -45,75 +35,28 @@ Requires: java-jfree-libserializer Requires: java-sac Requires: java-jfree-libloader Requires: java-pentaho-libxml -Requires: jpackage-utils +Requires: javapackages Provides: jfreereport = %{?epoch:%epoch:}%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Pentaho Reporting Flow Engine is a free Java report library, formerly known as "JFreeReport" -%if %with_gcj -%package gcj -Group: System/Libraries/Java -Summary: GCJ support for %{name} -Requires: java-gcj-compat - -%description gcj -Pentaho Reporting Flow Engine is a free Java report library, formerly known as "JFreeReport" - -This package contains GCJ support for %{name}. -%endif - -%package javadoc -Group: Documentation -Summary: Javadoc for %{name} - -%description javadoc -Pentaho Reporting Flow Engine is a free Java report library, formerly known as "JFreeReport" - -This package contains documentation for %{name}. - %prep %setup -q -c %{name}-%{version} - -for j in $(find . -name "*.jar"); do - rm -rf $j -done - -for txt in ChangeLog.txt licence-LGPL.txt README.txt; do - %{__perl} -pi -e 's/\r$//g' $txt -done - +%patch0 -p1 -b .remove-commons-logging mkdir -p lib -ln -sf $(build-classpath commons-logging-api) lib/ -ln -sf $(build-classpath libbase) lib/ -ln -sf $(build-classpath libfonts) lib/ -ln -sf $(build-classpath librepository) lib/ -ln -sf $(build-classpath liblayout) lib/ -ln -sf $(build-classpath libformula) lib/ -ln -sf $(build-classpath libserializer) lib/ -ln -sf $(build-classpath sac) lib/ -ln -sf $(build-classpath flute) lib/ -#ln -sf $(build-classpath jcommon-serializer) lib/ -ln -sf $(build-classpath libbase) lib/ -ln -sf $(build-classpath libloader) lib/ -ln -sf $(build-classpath libxml) lib/ -ln -sf $(build-classpath xml-commons-apis) lib/ +find . -name "*.jar" -exec rm -f {} \; +build-jar-repository -s -p lib libbase libloader \ + libfonts libxml libformula librepository sac flute liblayout \ + libserializer %build -unset JAVA_HOME -export JAVA_HOME=%{javahome} -export CLASSPATH="" -CLASSPATH=$CLASSPATH:$(build-classpath flute librepository libserializer libxml libbase) -CLASSPATH=$CLASSPATH:$(build-classpath libformula liblayout libfonts libloader sac xml-commons-apis) -CLASSPATH=$CLASSPATH:$(build-classpath commons-logging commons-logging-api junit-3.8.2) ant jar javadoc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" mkdir -p %{buildroot}%{_javadir} - install -pm 644 build/lib/flow-engine.jar %{buildroot}%{_javadir}/flow-engine-%{version}.jar ( @@ -123,13 +66,6 @@ install -pm 644 build/lib/flow-engine.jar %{buildroot}%{_javadir}/flow-engine-%{ done ) -mkdir -p %{buildroot}%{_javadocdir}/pentaho-reporting-flow-engine -cp -pr build/api/* %{buildroot}%{_javadocdir}/pentaho-reporting-flow-engine - -%if %with_gcj -%{_bindir}/aot-compile-rpm -%endif - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -137,30 +73,12 @@ cp -pr build/api/* %{buildroot}%{_javadocdir}/pentaho-reporting-flow-engine %defattr(-,root,root) %{_javadir}/flow-engine-%{version}.jar %{_javadir}/flow-engine.jar -%doc ChangeLog.txt licence-LGPL.txt README.txt - -%if %with_gcj -%post gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%postun gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%files gcj -%defattr(-,root,root) -%{_libdir}/gcj/java-pentaho-reporting-flow-engine/flow-engine-%{version}.jar.db -%{_libdir}/gcj/java-pentaho-reporting-flow-engine/flow-engine-%{version}.jar.so -%endif - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/pentaho-reporting-flow-engine +%doc licence-LGPL.txt %changelog +* Fri Dec 03 2021 Silvan Calarco 0.9.4-2mamba +- rebuilt + * Sat Jan 22 2011 gil 0.9.4-1mamba - update to 0.9.4