summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-08-06 02:47:21 +0000
committerCoprDistGit <infra@openeuler.org>2024-08-06 02:47:21 +0000
commit07202a5089311519b4abd1113790b70db33f81f8 (patch)
tree576fc1280a1cc31a862adce2f3775e8659f3b87e
parent2dad4dda28a4890d0385e4146ef440e7cb2823f3 (diff)
automatic import of libserializeropeneuler24.03_LTS
-rw-r--r--.gitignore1
-rw-r--r--libserializer-1.1.2-remove-antcontrib-support.patch247
-rw-r--r--libserializer-1.1.2-remove-commons-logging.patch31
-rw-r--r--libserializer-1.1.2.build.patch15
-rw-r--r--libserializer-1.1.2.java11.patch22
-rw-r--r--libserializer.spec151
-rw-r--r--sources1
7 files changed, 468 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e69de29..b52926d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libserializer-1.1.2-jarsdeleted.zip
diff --git a/libserializer-1.1.2-remove-antcontrib-support.patch b/libserializer-1.1.2-remove-antcontrib-support.patch
new file mode 100644
index 0000000..bc1b74c
--- /dev/null
+++ b/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
+ <property name="cobertura.build.cache.dir"
+ value="${build.cache.dir}/cobertura"
+ description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" />
+- <property name="antcontrib.build.cache.dir"
+- value="${build.cache.dir}/ant-contrib"
+- description="Directory where the Ant-Contrib jar (and dependencies) is placed after it is auto-downloaded by the build" />
+ <property name="pentaho.build.cache.dir"
+ value="${build.cache.dir}/pentaho"
+ description="Directory where the Pentaho ant tasks jar (and dependencies) is placed after it is auto-downloaded by the build" />
+@@ -325,68 +322,6 @@ TYPICAL TARGET SEQUENCE
+ </path>
+
+
+- <!--=======================================================================
+- install-antcontrib
+-
+- (Fetches and) installs ant-contrib tasks.
+- ====================================================================-->
+- <target name="install-antcontrib"
+- depends="antcontrib.download-check">
+- <taskdef resource="net/sf/antcontrib/antlib.xml">
+- <classpath>
+- <fileset dir="${antcontrib.build.cache.dir}">
+- <include name="*.jar" />
+- </fileset>
+- </classpath>
+- </taskdef>
+- </target>
+-
+-
+- <!--=======================================================================
+- antcontrib.download-check
+-
+- Fetches ant-contrib from sourceforge if it is not already present
+- ====================================================================-->
+- <target name="antcontrib.download-check">
+- <condition property="antcontrib.available">
+- <and>
+- <available file="${antcontrib.build.cache.dir}" />
+- <available classname="net.sf.antcontrib.logic.IfTask">
+- <classpath>
+- <fileset dir="${antcontrib.build.cache.dir}">
+- <include name="*.jar" />
+- </fileset>
+- </classpath>
+- </available>
+- </and>
+- </condition>
+- <antcall target="antcontrib.download" />
+- </target>
+-
+-
+- <!--=======================================================================
+- antcontrib.download
+-
+- Fetches ant-contrib from sourceforge
+- ====================================================================-->
+- <target name="antcontrib.download" unless="antcontrib.available">
+- <mkdir dir="${tmp.build.cache.dir}" />
+- <get src="http://downloads.sourceforge.net/ant-contrib/ant-contrib-1.0b3-bin.zip"
+- dest="${tmp.build.cache.dir}/antcontrib.zip"
+- usetimestamp="true" />
+- <unzip src="${tmp.build.cache.dir}/antcontrib.zip" dest="${tmp.build.cache.dir}">
+- <patternset>
+- <include name="**/*.jar" />
+- </patternset>
+- </unzip>
+- <copy todir="${antcontrib.build.cache.dir}">
+- <fileset dir="${tmp.build.cache.dir}/ant-contrib">
+- <include name="**/*.jar" />
+- </fileset>
+- </copy>
+- </target>
+-
+-
+ <!--=======================================================================
+ init
+
+@@ -445,7 +380,7 @@ TYPICAL TARGET SEQUENCE
+ (Fetches and) installs the SVN ANT for use by this ant script
+ ====================================================================-->
+ <target name="install-svnant"
+- depends="install-antcontrib, svnant.download-check">
++ depends="svnant.download-check">
+ <if>
+ <istrue value="${svnant.isinstalled}" />
+ <then>
+@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE
+ </target>
+
+
+- <!--=======================================================================
+- set-build.id
+-
+- Sets a property build.id to the either "development" or the svn revision
+- if in release mode
+- ====================================================================-->
+- <target name="set-build.id" unless="build.id" depends="install-antcontrib">
+- <if>
+- <istrue value="${release}" />
+- <then>
+- <antcallback target="svn-revision" return="svn.revision" />
+- <property name="build.id" value="${svn.revision}" />
+- </then>
+- <else>
+- <property name="build.id" value="development" />
+- </else>
+- </if>
+- </target>
+-
+- <!--=================================================================================
+- version-properties: common Ant driven version file generation. Projects that produce
+- a package or packages should run this target. Projects that produce
+- jars only should NOT.
+- ===================================================================================-->
+- <target name="version-properties" depends="set-build.id">
+- <tstamp>
+- <format property="build.time" pattern="yyyy/MM/dd hh:mm aa"/>
+- </tstamp>
+- <propertyfile
+- file="version.properties" comment="Release Build version info">
+- <entry key="release.major.number" value="${release.major.number}" />
+- <entry key="release.minor.number" value="${release.minor.number}" />
+- <entry key="release.milestone.number" value="${release.milestone.number}" />
+- <entry key="release.candidate.token" value="${release.candidate.token}" />
+- <entry key="impl.vendor" value="${impl.vendor}" />
+- <entry key="impl.version" value="${release.major.number}.${release.minor.number}.${release.milestone.number}.${build.id}" />
+- <entry key="impl.title" value="${impl.title}" />
+- <entry key="buildDate" value="${build.time}"/>
+- <entry key="svn.revision" value="${build.id}"/>
+- <entry key="release.build.number" default="0" type="int" operation="+" value="1" pattern="0000"/>
+- </propertyfile>
+- <property file="${basedir}/version.properties"/>
+- </target>
+-
+-
+ <!--=======================================================================
+ install-ivy
+
+ (Fetches and) installs the IVY jar for use by this ant script
+ ====================================================================-->
+ <target name="install-ivy"
+- depends="install-antcontrib,ivy.download-check">
++ depends="ivy.download-check">
+ <if>
+ <istrue value="${ivy.isinstalled}" />
+ <then>
+@@ -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.
+ ====================================================================-->
+- <target name="ivy.check-releasable" depends="install-ivy, install-antcontrib">
++ <target name="ivy.check-releasable" depends="install-ivy">
+ <if>
+ <istrue value="${release}" />
+ <then>
+@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE
+ Publishes the jar file for this project to a Maven2 repository.
+ ====================================================================-->
+ <target name="publish-pentaho-nojar"
+- depends="install-antcontrib,create-pom,ivy.deliver">
++ depends="create-pom,ivy.deliver">
+ <antcall target="maven-publish-dependencies">
+ <param name="publish.groupId" value="${ivy.artifact.group}" />
+ <param name="publish.artifactId" value="${ivy.artifact.id}" />
+@@ -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
+ ====================================================================-->
+ <target name="compile"
+- depends="init, compile.pre, compile.compile, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post"
++ depends="init, compile.pre, compile.compile, compile.src_copy, compile.lic_copy, compile.post"
+ description="Performs all the steps to prepare the bin directory with a complete compilation" />
+
+
+@@ -1074,37 +963,6 @@ TYPICAL TARGET SEQUENCE
+ </javac>
+ </target>
+
+-
+- <!--=======================================================================
+- compile.res_copy
+-
+- Copies any needed resources into the classes directory. Will not
+- duplicate copying of resources from src tree (handled by compile.src_copy
+- if jar.include.source is set.
+- ====================================================================-->
+- <target name="compile.res_copy" depends="install-antcontrib">
+- <if>
+- <available file="${res.dir}" />
+- <then>
+- <copy todir="${classes.dir}">
+- <fileset dir="${res.dir}" />
+- </copy>
+- </then>
+- </if>
+-
+- <if>
+- <not>
+- <isset property="jar.include.source" />
+- </not>
+- <then>
+- <copy todir="${classes.dir}" flatten="false">
+- <fileset dir="${src.dir}" excludes="**/*.java" />
+- </copy>
+- </then>
+- </if>
+- </target>
+-
+-
+ <!--=======================================================================
+ compile.src_copy
+
+@@ -1151,7 +1009,7 @@ TYPICAL TARGET SEQUENCE
+
+ Creates a jar file from the bin directory
+ ====================================================================-->
+- <target name="jar" depends="compile,set-build.id,generate.manifest" description="Jars up the bin directory after a compile">
++ <target name="jar" depends="compile,generate.manifest" description="Jars up the bin directory after a compile">
+ <jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+@@ -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.
+ ====================================================================-->
+- <target name="generate.manifest" depends="init,set-build.id">
++ <target name="generate.manifest" depends="init">
+ <delete file="${dist.manifest.file}" />
+ <touch file="${dist.manifest.file}" />
+ <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
+@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE
+ </dot-classpath>
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
diff --git a/libserializer-1.1.2-remove-commons-logging.patch b/libserializer-1.1.2-remove-commons-logging.patch
new file mode 100644
index 0000000..52ee76a
--- /dev/null
+++ b/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/libserializer-1.1.2.build.patch b/libserializer-1.1.2.build.patch
new file mode 100644
index 0000000..86b8c38
--- /dev/null
+++ b/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/libserializer-1.1.2.java11.patch b/libserializer-1.1.2.java11.patch
new file mode 100644
index 0000000..bd97d03
--- /dev/null
+++ b/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 @@
+ <property name="javac.deprecation"
+ value="true"
+ description="Indicates whether source should be compiled with deprecation information" />
+- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
+- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
++ <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" />
++ <property name="javac.target" value="1.6" description="Generate class files for specific VM version" />
+
+ <!-- Build Cache properties -->
+ <property name="build.cache.dir"
+@@ -1340,7 +1340,7 @@
+ depends="javadoc.init, compile">
+ <javadoc destdir="${javadoc.dir}/docs/api"
+ access="public"
+- source="1.5"
++ source="1.6"
+ use="true"
+ notree="false"
+ nonavbar="false"
diff --git a/libserializer.spec b/libserializer.spec
new file mode 100644
index 0000000..effbeb5
--- /dev/null
+++ b/libserializer.spec
@@ -0,0 +1,151 @@
+Name: libserializer
+Version: 1.1.2
+Release: 30%{?dist}
+Summary: JFreeReport General Serialization Framework
+License: LGPLv2+
+#Original source: http://downloads.sourceforge.net/jfreereport/libserializer-%%{version}.zip
+#unzip, find . -name "*.jar" -exec rm {} \;
+#to simplify the licensing
+Source: libserializer-%{version}-jarsdeleted.zip
+URL: http://reporting.pentaho.org
+BuildRequires: ant, java-devel, jpackage-utils, libbase >= 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
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.2-30
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+ Related: rhbz#1991688
+
+* 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
+- 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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 15 2021 Nicolas Lécureuil <neoclust@mageia.org> - 1.1.2-27
+- Remove ant-contrib support
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.2-25
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue May 05 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.2-24
+- allow rebuild with java 11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 04 2019 Stephan Bergmann <sbergman@redhat.com> - 1.1.3-21
+- Use /usr/share/java instead of _javadir macro for build dependencies
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Feb 25 2014 Caolán McNamara <caolanm@redhat.com> - 1.1.2-12
+- Resolves: rhbz#1068367 Switch to java-headless (build)requires
+
+* Wed Oct 23 2013 Caolán McNamara <caolanm@redhat.com> - 1.1.2-11
+- Resolves: rhbz#1022138 remove versioned jars
+
+* Tue Aug 06 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 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 <rel-eng@lists.fedoraproject.org> - 1.1.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Nov 02 2012 Caolán McNamara <caolanm@redhat.com> - 1.1.2-7
+- repack source to remove bundled multi-license .jars
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Oct 28 2011 Caolán McNamara <caolanm@redhat.com> - 1.1.2-4
+- Related: rhbz#749103 drop gcj aot
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jul 01 2010 Caolán McNamara <caolanm@redhat.com> 1.1.2-2
+- fix up source-code download foo
+
+* Fri Nov 20 2009 Caolán McNamara <caolanm@redhat.com> 1.1.2-1
+- initial fedora import
diff --git a/sources b/sources
new file mode 100644
index 0000000..28a843b
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b765641efaefcb1d567d5eaaea86dc84 libserializer-1.1.2-jarsdeleted.zip