From f3081ab39f81fe289f5217a65a7d9717e037482c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 15 Mar 2023 18:25:54 +0300 Subject: [PATCH] import libserializer-1.1.2-30.el9 --- .gitignore | 1 + .libserializer.metadata | 1 + ...izer-1.1.2-remove-antcontrib-support.patch | 247 ++++++++++++++++++ ...ializer-1.1.2-remove-commons-logging.patch | 31 +++ SOURCES/libserializer-1.1.2.build.patch | 15 ++ SOURCES/libserializer-1.1.2.java11.patch | 22 ++ SPECS/libserializer.spec | 154 +++++++++++ 7 files changed, 471 insertions(+) create mode 100644 .gitignore create mode 100644 .libserializer.metadata create mode 100644 SOURCES/libserializer-1.1.2-remove-antcontrib-support.patch create mode 100644 SOURCES/libserializer-1.1.2-remove-commons-logging.patch create mode 100644 SOURCES/libserializer-1.1.2.build.patch create mode 100644 SOURCES/libserializer-1.1.2.java11.patch create mode 100644 SPECS/libserializer.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..feaa3ea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libserializer-1.1.2-jarsdeleted.zip diff --git a/.libserializer.metadata b/.libserializer.metadata new file mode 100644 index 0000000..9569ba5 --- /dev/null +++ b/.libserializer.metadata @@ -0,0 +1 @@ +714c4f228bd3dbe8af2c5048d4f7de00fef2cab9 SOURCES/libserializer-1.1.2-jarsdeleted.zip diff --git a/SOURCES/libserializer-1.1.2-remove-antcontrib-support.patch b/SOURCES/libserializer-1.1.2-remove-antcontrib-support.patch new file mode 100644 index 0000000..bc1b74c --- /dev/null +++ b/SOURCES/libserializer-1.1.2-remove-antcontrib-support.patch @@ -0,0 +1,247 @@ +diff --git a/common_build.xml b/common_build.xml +index 239bfed..657d512 100644 +--- a/common_build.xml ++++ b/common_build.xml +@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE + +- + +@@ -325,68 +322,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="svnant.download-check"> + + + +@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="ivy.download-check"> + + + +@@ -602,7 +492,7 @@ TYPICAL TARGET SEQUENCE + Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. + If there are SNAPSHOTS, fail the release build. + ====================================================================--> +- ++ + + + +@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE + Publishes the jar file for this project to a Maven2 repository. + ====================================================================--> + ++ depends="create-pom,ivy.deliver"> + + + +@@ -1038,12 +928,11 @@ TYPICAL TARGET SEQUENCE + - compile.pre : anything needed to prep for compile + - compile.compile : the actual compilation step + - compile.src_copy : copying the source into the bin directory +- - compile.res_copy : copying the resources into the bin directory + - compile.lic_copy : copying the license information into the bin directory + - compile.post : anything needed after the compile is done + ====================================================================--> + + + +@@ -1074,37 +963,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +- ++ + + + +@@ -1164,7 +1022,7 @@ TYPICAL TARGET SEQUENCE + Creates a new manifest file if one is not specified, or updates + an existing manifest file if one is specified. + ====================================================================--> +- ++ + + + +@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE + + + +- +\ No newline at end of file ++ diff --git a/SOURCES/libserializer-1.1.2-remove-commons-logging.patch b/SOURCES/libserializer-1.1.2-remove-commons-logging.patch new file mode 100644 index 0000000..52ee76a --- /dev/null +++ b/SOURCES/libserializer-1.1.2-remove-commons-logging.patch @@ -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); + } + } + } diff --git a/SOURCES/libserializer-1.1.2.build.patch b/SOURCES/libserializer-1.1.2.build.patch new file mode 100644 index 0000000..86b8c38 --- /dev/null +++ b/SOURCES/libserializer-1.1.2.build.patch @@ -0,0 +1,15 @@ +--- libserializer-1.1.2/build.properties 2009-11-20 09:34:31.000000000 +0000 ++++ libserializer-1.1.2/build.properties 2009-11-20 09:34:37.000000000 +0000 +@@ -1,7 +1,11 @@ +-project.revision=TRUNK-SNAPSHOT ++project.revision=1.1.2 + ivy.artifact.group=pentaho-library + ivy.artifact.id=libserializer + impl.title=LibSerializer + impl.productID=libserializer + src.dir=${basedir}/source + dependency.libbase.revision=1.1.2 ++ ++antcontrib.available=true ++ ++build.cache.dir=lib diff --git a/SOURCES/libserializer-1.1.2.java11.patch b/SOURCES/libserializer-1.1.2.java11.patch new file mode 100644 index 0000000..bd97d03 --- /dev/null +++ b/SOURCES/libserializer-1.1.2.java11.patch @@ -0,0 +1,22 @@ +--- libserializer-1.1.2/common_build.xml 2020-05-05 19:40:10.080026171 +0100 ++++ libserializer-1.1.2/common_build.xml 2020-05-05 19:40:46.433336643 +0100 +@@ -136,8 +136,8 @@ + +- +- ++ ++ + + + + = 1.1.2 +Requires: java-headless, jpackage-utils, libbase >= 1.1.2 +BuildArch: noarch +Patch0: libserializer-1.1.2.build.patch +Patch1: libserializer-1.1.2.java11.patch +Patch2: libserializer-1.1.2-remove-antcontrib-support.patch +Patch3: libserializer-1.1.2-remove-commons-logging.patch + +%description +Libserializer contains a general serialization framework that simplifies the +task of writing custom java serialization handlers. + +%package javadoc +Summary: Javadoc for %{name} +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -c +%patch0 -p1 -b .build +%patch1 -p1 -b .java11 +%patch2 -p1 -b .no_antcontrib +%patch3 -p1 -b .no_commons_logging + +find . -name "*.jar" -exec rm -f {} \; +mkdir -p lib +build-jar-repository -s -p lib libbase + +%build +ant jar javadoc + +%install +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p dist/libserializer-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%doc ChangeLog.txt licence-LGPL.txt README.txt +%{_javadir}/%{name}.jar + +%files javadoc +%{_javadocdir}/%{name} + +%changelog +* Wed Mar 15 2023 MSVSphere Packaging Team - 1.1.2-30 +- Rebuilt for MSVSphere 9.1. + +* Mon Aug 09 2021 Mohan Boddu - 1.1.2-30 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 1.1.2-29 +- 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 - 1.1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Nicolas Lécureuil - 1.1.2-27 +- Remove ant-contrib support + +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.1.2-25 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue May 05 2020 Caolán McNamara - 1.1.2-24 +- allow rebuild with java 11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Apr 04 2019 Stephan Bergmann - 1.1.3-21 +- Use /usr/share/java instead of _javadir macro for build dependencies + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 25 2014 Caolán McNamara - 1.1.2-12 +- Resolves: rhbz#1068367 Switch to java-headless (build)requires + +* Wed Oct 23 2013 Caolán McNamara - 1.1.2-11 +- Resolves: rhbz#1022138 remove versioned jars + +* Tue Aug 06 2013 Parag Nemade - 1.1.2-10 +- ant-nodeps is dropped from ant-1.9.0-2 build in rawhide +- Drop buildroot, %%clean, %%defattr and removal of buildroot in %%install + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Nov 02 2012 Caolán McNamara - 1.1.2-7 +- repack source to remove bundled multi-license .jars + +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Caolán McNamara - 1.1.2-4 +- Related: rhbz#749103 drop gcj aot + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 01 2010 Caolán McNamara 1.1.2-2 +- fix up source-code download foo + +* Fri Nov 20 2009 Caolán McNamara 1.1.2-1 +- initial fedora import