Compare commits
No commits in common. "c9-beta" and "c8s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/flow-engine-0.9.4.zip
|
||||
flow-engine-0.9.4.zip
|
||||
|
||||
@ -1 +0,0 @@
|
||||
1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SOURCES/flow-engine-0.9.4.zip
|
||||
@ -1,101 +0,0 @@
|
||||
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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
Name: pentaho-reporting-flow-engine
|
||||
Version: 0.9.4
|
||||
Release: 24%{?dist}
|
||||
Release: 15%{?dist}
|
||||
Summary: Pentaho Flow Reporting Engine
|
||||
License: LGPLv2+
|
||||
Epoch: 1
|
||||
Group: System Environment/Libraries
|
||||
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
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
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
|
||||
Patch0: pentaho-reporting-flow-engine-0.9.4-remove-commons-logging.patch
|
||||
|
||||
%description
|
||||
Pentaho Reporting Flow Engine is a free Java report library, formerly
|
||||
@ -21,6 +22,7 @@ known as 'JFreeReport'
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Documentation
|
||||
Requires: %{name} = 1:%{version}-%{release}
|
||||
Requires: jpackage-utils
|
||||
|
||||
@ -29,10 +31,9 @@ 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 \
|
||||
build-jar-repository -s -p lib commons-logging-api libbase libloader \
|
||||
libfonts libxml jaxp libformula librepository sac flute liblayout \
|
||||
libserializer
|
||||
|
||||
@ -48,43 +49,19 @@ 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}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc licence-LGPL.txt README.txt ChangeLog.txt
|
||||
%{_javadir}/*.jar
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.9.4-24
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.9.4-23
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
- Related: rhbz#1951270 replace apache-commons-logging with java.util.logging
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.9.4-20
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.4-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
Loading…
Reference in New Issue
Block a user