diff --git a/libloader-1.1.3-remove-antcontrib-support.patch b/libloader-1.1.3-remove-antcontrib-support.patch index 8c59e37..1296ac8 100644 --- a/libloader-1.1.3-remove-antcontrib-support.patch +++ b/libloader-1.1.3-remove-antcontrib-support.patch @@ -2,7 +2,7 @@ diff --git a/common_build.xml b/common_build.xml index d9fe4b6..4eb9f28 100644 --- a/common_build.xml +++ b/common_build.xml -@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE +@@ -152,9 +152,6 @@ @@ -12,7 +12,7 @@ index d9fe4b6..4eb9f28 100644 -@@ -324,69 +321,6 @@ TYPICAL TARGET SEQUENCE +@@ -324,69 +321,6 @@ @@ -82,7 +82,7 @@ index d9fe4b6..4eb9f28 100644 -@@ -491,58 +425,13 @@ TYPICAL TARGET SEQUENCE - +@@ -492,57 +426,12 @@ -- @@ -160,7 +159,7 @@ index d9fe4b6..4eb9f28 100644 -@@ -769,7 +658,7 @@ TYPICAL TARGET SEQUENCE +@@ -769,7 +658,7 @@ Publishes the jar file for this project to a Maven2 repository. ====================================================================--> -@@ -1038,12 +927,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 - ====================================================================--> - - - -@@ -1076,36 +964,6 @@ TYPICAL TARGET SEQUENCE - - - -- ++ Copies any needed resources into the classes directory. + ====================================================================--> - - - @@ -214,13 +197,14 @@ index d9fe4b6..4eb9f28 100644 - - - -- -- -- - @@ -229,7 +213,7 @@ index d9fe4b6..4eb9f28 100644 -@@ -1165,7 +1023,7 @@ TYPICAL TARGET SEQUENCE +@@ -1165,7 +1036,7 @@ Creates a new manifest file if one is not specified, or updates an existing manifest file if one is specified. ====================================================================--> diff --git a/libloader.spec b/libloader.spec index 18bd74b..f30887b 100644 --- a/libloader.spec +++ b/libloader.spec @@ -1,6 +1,6 @@ Name: libloader Version: 1.1.3 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Resource Loading Framework License: LGPLv2 #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} %changelog +* Tue Apr 27 2021 Caolán McNamara - 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 + * Wed Apr 07 2021 Caolán McNamara - 1.1.3-30 - Related: rhbz#1895921 replace apache-commons-logging with java.util.logging