rpms/libserializer
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#1951281 FTBFS

Browse Source
This commit is contained in:
Caolán McNamara 2021-04-20 12:23:37 +01:00
parent f02a9671ea
commit cc2f449703
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libserializer-1.1.2-remove-commons-logging.patch Normal file
View File

@ -0,0 +1,31 @@
diff -ru libserializer-1.1.2.orig/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java libserializer-1.1.2/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java
--- libserializer-1.1.2.orig/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java 2021-04-07 11:22:05.509434457 +0100
+++ libserializer-1.1.2/source/org/pentaho/reporting/libraries/serializer/SerializerHelper.java 2021-04-07 11:23:19.102343782 +0100
@@ -25,8 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
import org.pentaho.reporting.libraries.base.config.Configuration;
import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
import org.pentaho.reporting.libraries.base.util.DebugLog;
@@ -41,7 +40,7 @@
*/
public class SerializerHelper
{
- private static final Log logger = LogFactory.getLog(SerializerHelper.class);
+ private static final Logger logger = Logger.getLogger(SerializerHelper.class.getName());
/**
* The singleton instance of the serialize helper.
*/
@@ -124,7 +123,7 @@
}
else
{
- logger.warn("Invalid SerializeMethod implementation: " + c);
+ logger.warning("Invalid SerializeMethod implementation: " + c);
}
}
}

5
libserializer.spec
View File

@ -14,6 +14,7 @@ BuildArch: noarch
Patch0: libserializer-1.1.2.build.patch Patch0: libserializer-1.1.2.build.patch
Patch1: libserializer-1.1.2.java11.patch Patch1: libserializer-1.1.2.java11.patch
Patch2: libserializer-1.1.2-remove-antcontrib-support.patch Patch2: libserializer-1.1.2-remove-antcontrib-support.patch
Patch3: libserializer-1.1.2-remove-commons-logging.patch
%description %description
Libserializer contains a general serialization framework that simplifies the Libserializer contains a general serialization framework that simplifies the
@ -32,10 +33,11 @@ Javadoc for %{name}.
%patch0 -p1 -b .build %patch0 -p1 -b .build
%patch1 -p1 -b .java11 %patch1 -p1 -b .java11
%patch2 -p1 -b .no_antcontrib %patch2 -p1 -b .no_antcontrib
%patch3 -p1 -b .no_commons_logging
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
mkdir -p lib mkdir -p lib
build-jar-repository -s -p lib libbase commons-logging-api build-jar-repository -s -p lib libbase
%build %build
ant jar javadoc ant jar javadoc
@ -57,6 +59,7 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog %changelog
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.2-29 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.2-29
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
- Related: rhbz#1951281 replace apache-commons-logging with java.util.logging
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-28 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild