rpms/java-jfree-libserializer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt without gcj and with java11 [release 1.1.3-2mamba;Fri Dec 10 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 00:06:47 +01:00
parent d8d57e5d02
commit d82c9b0dbc
6 changed files with 323 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java-jfree-libserializer-1.1.3-build.patch Normal file
View File

@ -0,0 +1,8 @@
--- java-jfree-libserializer-1.1.3/build.properties.orig 2021-12-10 21:29:27.879764097 +0100
+++ java-jfree-libserializer-1.1.3/build.properties 2021-12-10 21:29:43.940062856 +0100
@@ -1,4 +1,4 @@
-project.revision=TRUNK-SNAPSHOT
+project.revision=1.1.3
ivy.artifact.group=pentaho-library
ivy.artifact.id=libserializer
impl.title=LibSerializer

14
java-jfree-libserializer-1.1.3-build_properties.patch
View File

@ -1,14 +0,0 @@
--- build.properties 2009-11-16 10:19:34.000000000 +0100
+++ build.properties-gil 2011-01-22 15:14:20.000000000 +0100
@@ -1,7 +1,9 @@
-project.revision=TRUNK-SNAPSHOT
+project.revision=1.1.3
ivy.artifact.group=pentaho-library
ivy.artifact.id=libserializer
impl.title=LibSerializer
impl.productID=libserializer
src.dir=${basedir}/source
dependency.libbase.revision=1.1.3
+antcontrib.available=true
+build.cache.dir=lib
\ Manca newline alla fine del file

13
java-jfree-libserializer-1.1.3-java11.patch Normal file
View File

@ -0,0 +1,13 @@
--- java-jfree-libserializer-1.1.3/common_build.xml.orig 2021-12-10 21:27:01.142034301 +0100
+++ java-jfree-libserializer-1.1.3/common_build.xml 2021-12-10 21:27:13.630266633 +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.8" description="Provide source compatibility with specified release" />
+ <property name="javac.target" value="1.8" description="Generate class files for specific VM version" />
<!-- Build Cache properties -->
<property name="build.cache.dir"

247
java-jfree-libserializer-1.1.3-remove-antcontrib-support.patch Normal file
View File

@ -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>

31
java-jfree-libserializer-1.1.3-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);
}
}
}

98
java-jfree-libserializer.spec
View File

@ -1,87 +1,55 @@
%define with_gcj 1
%define javahome %{_jvmdir}/jdk
Name: java-jfree-libserializer
Version: 1.1.3
Release: 1mamba
Release: 2mamba
Summary: JFree Java General Serialization Framework Library
Group: Development/Libraries/Java
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://reporting.pentaho.org/
Source: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/1.1.3-stable/libserializer-1.1.3.zip
Patch0: java-jfree-libserializer-1.1.3-build_properties.patch
URL: https://community.hitachivantara.com/home
Source: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/libserializer-%{version}.zip
Patch0: java-jfree-libserializer-1.1.3-remove-antcontrib-support.patch
Patch1: java-jfree-libserializer-1.1.3-remove-commons-logging.patch
Patch2: java-jfree-libserializer-1.1.3-java11.patch
Patch3: java-jfree-libserializer-1.1.3-build.patch
License: LGPL
BuildRequires: ant-contribb3
## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END
BuildRequires: javapackages
BuildRequires: apache-ant
BuildRequires: jakarta-commons-logging
BuildRequires: java-jfree-libbase
BuildRequires: java-junit3
BuildRequires: jpackage-utils
Requires: jakarta-commons-logging
Requires: java-jfree-libbase
Requires: jpackage-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: javapackages
%description
This library module contains a general serialization framework. It simplifies the task of writing custom serialization handlers for non-serializable classes.
%if %with_gcj
%package gcj
Group: System/Libraries/Java
Summary: GCJ support for %{name}
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: java-gcj-compat
BuildRequires: libgcc
BuildRequires: libgcj4-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
Requires: java-gcj-compat
%description gcj
JFree Java General Serialization Framework Library.
This package contains GCJ support for %{name}.
%endif
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
JFree Java General Serialization Framework Library.
This package contains documentation for %{name}.
%prep
%setup -q -c %{name}-%{version}
%patch0
for j in $(find . -name "*.jar"); do
rm -rf $j
done
%setup -q -c
%patch0 -p1 -b .remove-antcontrib-support
%patch1 -p1 -b .remove-commons-logging
%patch2 -p1 -b .java11
%patch3 -p1 -b .build
for txt in ChangeLog.txt licence-LGPL.txt README.txt; do
%{__perl} -pi -e 's/\r$//g' $txt
done
mkdir -p lib/ant-contrib
ln -sf $(build-classpath commons-logging-api) lib/commons-logging-api-1.0.4.jar
ln -sf $(build-classpath libbase) lib/libbase-%{version}.jar
ln -s %{_javadir}/ant/* lib/ant-contrib
find . -name "*.jar" -exec rm -f {} \;
mkdir -p lib
build-jar-repository -s -p lib libbase
%build
unset JAVA_HOME
export JAVA_HOME=%{javahome}
export CLASSPATH=$(build-classpath ant-contribb3 junit-3.8.2 libbase commons-logging commons-logging-api)
ant \
jar javadoc
ant jar javadoc
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
mkdir -p %{buildroot}%{_javadir}
install -pm 644 dist/libserializer-%{version}.jar %{buildroot}%{_javadir}/libserializer-%{version}.jar
(
@ -94,10 +62,6 @@ install -pm 644 dist/libserializer-%{version}.jar %{buildroot}%{_javadir}/libser
mkdir -p %{buildroot}%{_javadocdir}/libserializer
cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libserializer
%if %with_gcj
%{_bindir}/aot-compile-rpm
%endif
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -105,30 +69,16 @@ cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libserializer
%defattr(-,root,root)
%{_javadir}/libserializer-%{version}.jar
%{_javadir}/libserializer.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-jfree-libserializer/libserializer-%{version}.jar.db
%{_libdir}/gcj/java-jfree-libserializer/libserializer-%{version}.jar.so
%endif
%doc licence-LGPL.txt
%files javadoc
%defattr(-,root,root)
%{_javadocdir}/libserializer
%changelog
* Fri Dec 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.3-2mamba
- rebuilt without gcj and with java11
* Sat Jan 22 2011 gil <puntogil@libero.it> 1.1.3-1mamba
- update to 1.1.3