From a24e921b96e83a3dca930a6c0bba604cc11d67f41ae6f4e72ef6a223a3c6cf7d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:04:45 +0000
Subject: [PATCH] Accepting request 1114350 from Java:packages:test

simplify

OBS-URL: https://build.opensuse.org/request/show/1114350
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant-contrib?expand=0&rev=35
---
 ant-contrib-pom.patch | 13 -------------
 ant-contrib.spec      | 35 ++++++++++++++---------------------
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 ant-contrib-pom.patch

diff --git a/ant-contrib-pom.patch b/ant-contrib-pom.patch
deleted file mode 100644
index 44d1bab..0000000
--- a/ant-contrib-pom.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ant-contrib-1.0b3.pom b/ant-contrib-1.0b3.pom
-index 59dea4a..ca99233 100644
---- a/ant-contrib-1.0b3.pom
-+++ b/ant-contrib-1.0b3.pom
-@@ -17,7 +17,7 @@
-   <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
-   <dependencies>
-     <dependency>
--      <groupId>ant</groupId>
-+      <groupId>org.apache.ant</groupId>
-       <artifactId>ant</artifactId>
-       <version>1.5</version>
-     </dependency>
diff --git a/ant-contrib.spec b/ant-contrib.spec
index e6168de..1455036 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ant-contrib
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,17 +22,16 @@ Release:        0
 Summary:        Collection of tasks for Ant
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://ant-contrib.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
-Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
+URL:            https://ant-contrib.sourceforge.net/
+Source0:        https://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
+Source1:        https://repo1.maven.org/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
 # ASL 2.0 Licence text
 # Upstream bug at https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920
 Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Patch0:         local-ivy.patch
 Patch1:         ant-contrib-antservertest.patch
-Patch2:         ant-contrib-pom.patch
-Patch3:         ant-contrib-1.0b3-enable-for-task.patch
-Patch4:         ant-contrib-sourcetarget.patch
+Patch2:         ant-contrib-1.0b3-enable-for-task.patch
+Patch3:         ant-contrib-sourcetarget.patch
 BuildRequires:  ant
 BuildRequires:  apache-ivy
 BuildRequires:  bcel >= 5.1
@@ -40,8 +39,7 @@ BuildRequires:  commons-httpclient
 BuildRequires:  commons-logging
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 BuildRequires:  xerces-j2
 Requires:       junit >= 3.8.1
@@ -70,13 +68,14 @@ Api documentation for %{name}.
 
 %prep
 %setup -q -n %{name}
-cp %{SOURCE1} %{name}-1.0b3.pom
+cp %{SOURCE1} %{name}-%{version}.pom
 cp %{SOURCE2} LICENSE-2.0.txt
 %patch0
 %patch1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+%pom_change_dep ant: org.apache.ant %{name}-%{version}.pom
 
 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
 
@@ -85,7 +84,7 @@ sed -i "s|xercesImpl|xerces-j2|g" ivy.xml ||:
 rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
 
 %build
-ant dist
+%{ant} dist
 
 %install
 # jars
@@ -100,19 +99,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib
 
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom
-
-echo "call add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar"
+%{mvn_install_pom} %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom
 %add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
 
-%files
+%files -f .mfiles
 %defattr(0644,root,root,0755)
-%license target/docs/LICENSE.txt
-%doc LICENSE-2.0.txt
+%license target/docs/LICENSE.txt LICENSE-2.0.txt
 %config %{_sysconfdir}/ant.d/%{name}
-%{_javadir}/ant/%{name}.jar
-%{_mavenpomdir}/JPP.ant-%{name}.pom
-%{_datadir}/maven-metadata/%{name}.xml
 
 %files manual
 %doc target/docs/manual/tasks/*