diff --git a/libfonts-1.1.3-remove-antcontrib-support.patch b/libfonts-1.1.3-remove-antcontrib-support.patch
new file mode 100644
index 0000000..0017c0b
--- /dev/null
+++ b/libfonts-1.1.3-remove-antcontrib-support.patch
@@ -0,0 +1,247 @@
+diff --git a/common_build.xml b/common_build.xml
+index 3a42daa..0589cd2 100644
+--- a/common_build.xml
++++ b/common_build.xml
+@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE
+
+-
+
+@@ -324,69 +321,6 @@ TYPICAL TARGET SEQUENCE
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
++ depends="svnant.download-check">
+
+
+
+@@ -491,58 +425,13 @@ TYPICAL TARGET SEQUENCE
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
++ depends="ivy.download-check">
+
+
+
+@@ -602,7 +491,7 @@ TYPICAL TARGET SEQUENCE
+ Verifies that there are no SNAPSHOT dependencies defined in the ivy xml.
+ If there are SNAPSHOTS, fail the release build.
+ ====================================================================-->
+-
++
+
+
+
+@@ -769,7 +658,7 @@ TYPICAL TARGET SEQUENCE
+ Publishes the jar file for this project to a Maven2 repository.
+ ====================================================================-->
+
++ depends="create-pom,ivy.deliver">
+
+
+
+@@ -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
+ ====================================================================-->
+
+
+
+@@ -1075,36 +963,6 @@ TYPICAL TARGET SEQUENCE
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+-
++
+
+
+
+@@ -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.
+ ====================================================================-->
+-
++
+
+
+
+@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE
+
+
+
+-
+\ No newline at end of file
++
diff --git a/libfonts.spec b/libfonts.spec
index 1631967..a85a282 100644
--- a/libfonts.spec
+++ b/libfonts.spec
@@ -1,6 +1,6 @@
Name: libfonts
Version: 1.1.3
-Release: 29%{?dist}
+Release: 30%{?dist}
Summary: TrueType Font Layouting
License: LGPLv2 and UCD
#Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
@@ -8,12 +8,12 @@ License: LGPLv2 and UCD
#to simplify the licensing
Source: %{name}-%{version}-jarsdeleted.zip
URL: http://reporting.pentaho.org/
-BuildRequires: ant, ant-contrib, java-devel, jpackage-utils, libloader >= 1.1.3
+BuildRequires: ant, java-devel, jpackage-utils, libloader >= 1.1.3
Requires: java-headless, jpackage-utils, libloader >= 1.1.3
BuildArch: noarch
Patch0: libfonts-1.1.2.build.patch
Patch1: libfonts-1.1.2.java11.patch
-
+Patch2: libfonts-1.1.3-remove-antcontrib-support.patch
%description
LibFonts is a library developed to support advanced layouting in JFreeReport.
This library allows to read TrueType-Font files to extract layouting specific
@@ -31,12 +31,11 @@ Javadoc for %{name}.
%setup -q -c
%patch0 -p1 -b .build
%patch1 -p1 -b .java11
+%patch2 -p1 -b .no_antcontrib
find . -name "*.jar" -exec rm -f {} \;
rm -r source/org/pentaho/reporting/libraries/fonts/itext
mkdir -p lib
build-jar-repository -s -p lib libbase commons-logging-api libloader
-cd lib
-ln -s /usr/share/java/ant ant-contrib
%build
ant jar javadoc
@@ -60,6 +59,9 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Fri Jan 15 2021 Nicolas Lécureuil - 1.1.3-30
+- Remove ant-contrib support
+
* Tue Jul 28 2020 Fedora Release Engineering - 1.1.3-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild