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

Related: rhbz#1951284 rebuild to fix removal of ant-contrib

Browse Source 
"Remove ant-contrib support" dropped compile.res_copy target so
.properties files didn't get included in the jar so libloader didn't use
its built-in loaders so libreoffice's database report generator didn't
work
This commit is contained in:
Caolán McNamara 2021-04-27 15:33:14 +01:00
parent 67290707ac
commit 17cfca9f94
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libloader-1.1.3-remove-antcontrib-support.patch
View File

@ -2,7 +2,7 @@ diff --git a/common_build.xml b/common_build.xml
index d9fe4b6..4eb9f28 100644 index d9fe4b6..4eb9f28 100644
--- a/common_build.xml --- a/common_build.xml
+++ b/common_build.xml +++ b/common_build.xml
@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE @@ -152,9 +152,6 @@
<property name="cobertura.build.cache.dir" <property name="cobertura.build.cache.dir"
value="${build.cache.dir}/cobertura" value="${build.cache.dir}/cobertura"
description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" /> description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" />
@ -12,7 +12,7 @@ index d9fe4b6..4eb9f28 100644
<property name="pentaho.build.cache.dir" <property name="pentaho.build.cache.dir"
value="${build.cache.dir}/pentaho" 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" /> description="Directory where the Pentaho ant tasks jar (and dependencies) is placed after it is auto-downloaded by the build" />
@@ -324,69 +321,6 @@ TYPICAL TARGET SEQUENCE @@ -324,69 +321,6 @@
<dirset dir="${testclasses.dir}" /> <dirset dir="${testclasses.dir}" />
</path> </path>
@ -82,7 +82,7 @@ index d9fe4b6..4eb9f28 100644
<!--======================================================================= <!--=======================================================================
init init
@@ -445,7 +379,7 @@ TYPICAL TARGET SEQUENCE @@ -445,7 +379,7 @@
(Fetches and) installs the SVN ANT for use by this ant script (Fetches and) installs the SVN ANT for use by this ant script
====================================================================--> ====================================================================-->
<target name="install-svnant" <target name="install-svnant"
@ -91,11 +91,10 @@ index d9fe4b6..4eb9f28 100644
<if> <if>
<istrue value="${svnant.isinstalled}" /> <istrue value="${svnant.isinstalled}" />
<then> <then>
@@ -491,58 +425,13 @@ TYPICAL TARGET SEQUENCE @@ -492,57 +426,12 @@
</target>
- <!--======================================================================= <!--=======================================================================
- set-build.id - set-build.id
- -
- Sets a property build.id to the either "development" or the svn revision - Sets a property build.id to the either "development" or the svn revision
@ -140,7 +139,7 @@ index d9fe4b6..4eb9f28 100644
- </target> - </target>
- -
- -
<!--======================================================================= - <!--=======================================================================
install-ivy install-ivy
(Fetches and) installs the IVY jar for use by this ant script (Fetches and) installs the IVY jar for use by this ant script
@ -151,7 +150,7 @@ index d9fe4b6..4eb9f28 100644
<if> <if>
<istrue value="${ivy.isinstalled}" /> <istrue value="${ivy.isinstalled}" />
<then> <then>
@@ -602,7 +491,7 @@ TYPICAL TARGET SEQUENCE @@ -602,7 +491,7 @@
Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. Verifies that there are no SNAPSHOT dependencies defined in the ivy xml.
If there are SNAPSHOTS, fail the release build. If there are SNAPSHOTS, fail the release build.
====================================================================--> ====================================================================-->
@ -160,7 +159,7 @@ index d9fe4b6..4eb9f28 100644
<if> <if>
<istrue value="${release}" /> <istrue value="${release}" />
<then> <then>
@@ -769,7 +658,7 @@ TYPICAL TARGET SEQUENCE @@ -769,7 +658,7 @@
Publishes the jar file for this project to a Maven2 repository. Publishes the jar file for this project to a Maven2 repository.
====================================================================--> ====================================================================-->
<target name="publish-pentaho-nojar" <target name="publish-pentaho-nojar"
@ -169,31 +168,15 @@ index d9fe4b6..4eb9f28 100644
<antcall target="maven-publish-dependencies"> <antcall target="maven-publish-dependencies">
<param name="publish.groupId" value="${ivy.artifact.group}" /> <param name="publish.groupId" value="${ivy.artifact.group}" />
<param name="publish.artifactId" value="${ivy.artifact.id}" /> <param name="publish.artifactId" value="${ivy.artifact.id}" />
@@ -1038,12 +927,11 @@ TYPICAL TARGET SEQUENCE @@ -1079,30 +968,12 @@
- compile.pre : anything needed to prep for compile <!--=======================================================================
- compile.compile : the actual compilation step compile.res_copy
- 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" />
@@ -1076,36 +964,6 @@ TYPICAL TARGET SEQUENCE
</target>
- <!--=======================================================================
- compile.res_copy
-
- Copies any needed resources into the classes directory. Will not - Copies any needed resources into the classes directory. Will not
- duplicate copying of resources from src tree (handled by compile.src_copy - duplicate copying of resources from src tree (handled by compile.src_copy
- if jar.include.source is set. - if jar.include.source is set.
- ====================================================================--> + Copies any needed resources into the classes directory.
====================================================================-->
- <target name="compile.res_copy" depends="install-antcontrib"> - <target name="compile.res_copy" depends="install-antcontrib">
- <if> - <if>
- <available file="${res.dir}" /> - <available file="${res.dir}" />
@ -214,13 +197,14 @@ index d9fe4b6..4eb9f28 100644
- </copy> - </copy>
- </then> - </then>
- </if> - </if>
- </target> + <target name="compile.res_copy">
- + <copy todir="${classes.dir}" flatten="false">
- + <fileset dir="${src.dir}" excludes="**/*.java" />
<!--======================================================================= + </copy>
compile.src_copy </target>
@@ -1152,7 +1010,7 @@ TYPICAL TARGET SEQUENCE
@@ -1152,7 +1023,7 @@
Creates a jar file from the bin directory Creates a jar file from the bin directory
====================================================================--> ====================================================================-->
@ -229,7 +213,7 @@ index d9fe4b6..4eb9f28 100644
<jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}"> <jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}">
<fileset dir="${classes.dir}" /> <fileset dir="${classes.dir}" />
</jar> </jar>
@@ -1165,7 +1023,7 @@ TYPICAL TARGET SEQUENCE @@ -1165,7 +1036,7 @@
Creates a new manifest file if one is not specified, or updates Creates a new manifest file if one is not specified, or updates
an existing manifest file if one is specified. an existing manifest file if one is specified.
====================================================================--> ====================================================================-->

8
libloader.spec
View File

@ -1,6 +1,6 @@
Name: libloader Name: libloader
Version: 1.1.3 Version: 1.1.3
Release: 30%{?dist} Release: 31%{?dist}
Summary: Resource Loading Framework Summary: Resource Loading Framework
License: LGPLv2 License: LGPLv2
#Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip #Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
@ -66,6 +66,12 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Tue Apr 27 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-31
- Remove ant-contrib support dropped compile.res_copy target so
.properties files didn't get included in the jar so libloader
didn't use its built-in loaders so libreoffice's database
report generator didn't work
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-30
- 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#1951284 replace apache-commons-logging with java.util.logging - Related: rhbz#1951284 replace apache-commons-logging with java.util.logging