From 9b58f258bbb1bc33c8ec3166f363f19f2d342449 Mon Sep 17 00:00:00 2001
From: Zdenek Zambersky <zzambers@redhat.com>
Date: Aug 01 2023 10:08:24 +0000
Subject: Fixed build on latest fedora

fixes: rhbz#2217892

---

diff --git a/ant-contrib-antservertest.patch b/ant-contrib-antservertest.patch
index a486712..aba2235 100644
--- a/ant-contrib-antservertest.patch
+++ b/ant-contrib-antservertest.patch
@@ -1,5 +1,7 @@
---- test/resources/antserver/antservertest.xml.orig	2005-02-03 19:04:11.000000000 -0500
-+++ test/resources/antserver/antservertest.xml	2006-06-01 11:57:05.000000000 -0400
+diff --git a/test/resources/antserver/antservertest.xml b/test/resources/antserver/antservertest.xml
+index 77f8db0..c51fad0 100644
+--- a/test/resources/antserver/antservertest.xml
++++ b/test/resources/antserver/antservertest.xml
 @@ -3,8 +3,8 @@
  
      <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 73b05bd..bd0a455 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -3,8 +3,10 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.41.%{beta_number}%{?dist}
-License:        ASL 2.0 and ASL 1.1
+Release:        0.42.%{beta_number}%{?dist}
+# Project site on sf lists both Apache Software License, Apache License V2.0
+# see: https://sourceforge.net/projects/ant-contrib/
+License:        Apache-2.0 AND Apache-1.1
 
 URL:            http://ant-contrib.sourceforge.net/
 Source0:        https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
@@ -22,7 +24,6 @@ BuildRequires:  xerces-j2
 BuildRequires:  bcel
 BuildRequires:  java-devel
 BuildRequires:  apache-ivy
-BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-parent
 
@@ -40,28 +41,32 @@ for Apache Ant.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description    javadoc
 Api documentation for %{name}.
 
 %prep
 %setup -q  -n %{name}
-%patch2
-%patch3 -p1
+%autopatch -p1
 
-cp %{SOURCE2} LICENSE-2.0.txt
+cp -p %{SOURCE2} LICENSE-2.0.txt
 
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
+find -name '*.class' -delete
+find -name '*.jar' -delete
 
 sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
 # needs porting to latest ivy
 rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
+# remove httpclient stuff
+rm -fr src/java/net/sf/antcontrib/net/httpclient
 
 sed -i '/<ivy:configure /d' build.xml
 rm -f ivy-conf.xml
 
+sed -i 's/antlib:fr.jayasoft.ivy.ant/antlib:org.apache.ivy.ant/g' build.xml
+sed -i 's/org="jayasoft"/org="org.apache.ivy"/g' ivy.xml
+sed -i '/<dependency org="apache"/{N;N;N;/commons-httpclient/d}' ivy.xml
+
 sed -i '/<info /s//&revision="1.0b3" /' ivy.xml
 %mvn_alias : ant-contrib:
 
@@ -77,13 +82,19 @@ echo "ant-contrib/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
 %files -f .mfiles
 %{_sysconfdir}/ant.d/ant-contrib
-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
+%license target/docs/LICENSE.txt LICENSE-2.0.txt
 %doc target/docs/manual/tasks/*
 
 %files javadoc -f .mfiles-javadoc
-%doc target/docs/LICENSE.txt LICENSE-2.0.txt
+%license target/docs/LICENSE.txt LICENSE-2.0.txt
 
 %changelog
+* Wed Jul 26 2023 Zdenek Zambersky <zzambers@redhat.com> - 1.0-0.42.b3
+- fixed build problems with goal to unretire package
+- removed dependency on deprecated/removed commons-httpclient
+- fixed ivy org/namespace
+- fixes based on re-review
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.41.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild