Resolves: rhbz#1963838 merge in fedora fixes
This commit is contained in:
Caolán McNamara
parent
22cf463586
commit
5a817f4e45
@ -2,7 +2,7 @@ diff --git a/common_build.xml b/common_build.xml
|
||||
index 3a42daa..5575f19 100644
|
||||
--- a/common_build.xml
|
||||
+++ b/common_build.xml
|
||||
@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE
|
||||
@@ -152,9 +152,6 @@
|
||||
<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" />
|
||||
@ -12,11 +12,10 @@ index 3a42daa..5575f19 100644
|
||||
<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>
|
||||
@@ -326,68 +323,6 @@
|
||||
|
||||
|
||||
- <!--=======================================================================
|
||||
<!--=======================================================================
|
||||
- install-antcontrib
|
||||
-
|
||||
- (Fetches and) installs ant-contrib tasks.
|
||||
@ -78,10 +77,11 @@ index 3a42daa..5575f19 100644
|
||||
- </target>
|
||||
-
|
||||
-
|
||||
<!--=======================================================================
|
||||
- <!--=======================================================================
|
||||
init
|
||||
|
||||
@@ -445,7 +380,7 @@ TYPICAL TARGET SEQUENCE
|
||||
Ensures that all the required directories exist before processing
|
||||
@@ -445,7 +380,7 @@
|
||||
(Fetches and) installs the SVN ANT for use by this ant script
|
||||
====================================================================-->
|
||||
<target name="install-svnant"
|
||||
@ -90,11 +90,10 @@ index 3a42daa..5575f19 100644
|
||||
<if>
|
||||
<istrue value="${svnant.isinstalled}" />
|
||||
<then>
|
||||
@@ -491,58 +426,13 @@ TYPICAL TARGET SEQUENCE
|
||||
</target>
|
||||
@@ -492,57 +427,12 @@
|
||||
|
||||
|
||||
- <!--=======================================================================
|
||||
<!--=======================================================================
|
||||
- set-build.id
|
||||
-
|
||||
- Sets a property build.id to the either "development" or the svn revision
|
||||
@ -139,7 +138,7 @@ index 3a42daa..5575f19 100644
|
||||
- </target>
|
||||
-
|
||||
-
|
||||
<!--=======================================================================
|
||||
- <!--=======================================================================
|
||||
install-ivy
|
||||
|
||||
(Fetches and) installs the IVY jar for use by this ant script
|
||||
@ -150,7 +149,7 @@ index 3a42daa..5575f19 100644
|
||||
<if>
|
||||
<istrue value="${ivy.isinstalled}" />
|
||||
<then>
|
||||
@@ -602,7 +492,7 @@ TYPICAL TARGET SEQUENCE
|
||||
@@ -602,7 +492,7 @@
|
||||
Verifies that there are no SNAPSHOT dependencies defined in the ivy xml.
|
||||
If there are SNAPSHOTS, fail the release build.
|
||||
====================================================================-->
|
||||
@ -159,7 +158,7 @@ index 3a42daa..5575f19 100644
|
||||
<if>
|
||||
<istrue value="${release}" />
|
||||
<then>
|
||||
@@ -769,7 +659,7 @@ TYPICAL TARGET SEQUENCE
|
||||
@@ -769,7 +659,7 @@
|
||||
Publishes the jar file for this project to a Maven2 repository.
|
||||
====================================================================-->
|
||||
<target name="publish-pentaho-nojar"
|
||||
@ -168,31 +167,10 @@ index 3a42daa..5575f19 100644
|
||||
<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
|
||||
@@ -1082,26 +972,10 @@
|
||||
duplicate copying of resources from src tree (handled by compile.src_copy
|
||||
if jar.include.source is set.
|
||||
====================================================================-->
|
||||
<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" />
|
||||
|
||||
|
||||
@@ -1075,36 +964,6 @@ TYPICAL TARGET SEQUENCE
|
||||
</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}" />
|
||||
@ -213,13 +191,14 @@ index 3a42daa..5575f19 100644
|
||||
- </copy>
|
||||
- </then>
|
||||
- </if>
|
||||
- </target>
|
||||
-
|
||||
-
|
||||
<!--=======================================================================
|
||||
compile.src_copy
|
||||
+ <target name="compile.res_copy">
|
||||
+ <copy todir="${classes.dir}" flatten="false">
|
||||
+ <fileset dir="${src.dir}" excludes="**/*.java" />
|
||||
+ </copy>
|
||||
</target>
|
||||
|
||||
@@ -1151,7 +1010,7 @@ TYPICAL TARGET SEQUENCE
|
||||
|
||||
@@ -1151,7 +1025,7 @@
|
||||
|
||||
Creates a jar file from the bin directory
|
||||
====================================================================-->
|
||||
@ -228,7 +207,7 @@ index 3a42daa..5575f19 100644
|
||||
<jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}">
|
||||
<fileset dir="${classes.dir}" />
|
||||
</jar>
|
||||
@@ -1164,7 +1023,7 @@ TYPICAL TARGET SEQUENCE
|
||||
@@ -1164,7 +1038,7 @@
|
||||
Creates a new manifest file if one is not specified, or updates
|
||||
an existing manifest file if one is specified.
|
||||
====================================================================-->
|
||||
@ -237,7 +216,7 @@ index 3a42daa..5575f19 100644
|
||||
<delete file="${dist.manifest.file}" />
|
||||
<touch file="${dist.manifest.file}" />
|
||||
<copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
|
||||
@@ -1648,4 +1507,4 @@ TYPICAL TARGET SEQUENCE
|
||||
@@ -1648,4 +1522,4 @@
|
||||
</dot-classpath>
|
||||
</target>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: libformula
|
||||
Version: 1.1.3
|
||||
Release: 30%{?dist}
|
||||
Release: 31%{?dist}
|
||||
Summary: Formula Parser
|
||||
License: LGPLv2
|
||||
#Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
|
||||
@ -58,6 +58,13 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed May 19 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-31
|
||||
- Resolves: rhbz#1963838 restore missing functions
|
||||
Remove ant-contrib support dropped compile.res_copy target so
|
||||
.properties files didn't get included in the jar so libformula
|
||||
didn't use its built-in loaders so libreoffice's database
|
||||
report generator didn't show all categories in formula wizard
|
||||
|
||||
* 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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user