From 96dc5d8d75cfadcecf62c8a4ffa7ebd3e07bdade3dce358187996f91ae4ef582 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:48:56 +0000
Subject: [PATCH] Accepting request 1114390 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114390
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=36
---
 xmlunit.spec | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/xmlunit.spec b/xmlunit.spec
index 284fd7e..9ccd3cb 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlunit
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,15 +23,14 @@ Release:        0
 Summary:        Provides classes to do asserts on XML
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-URL:            http://xmlunit.sourceforge.net/
+URL:            https://xmlunit.sourceforge.net/
 Source0:        https://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
 Source1:        https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
 # Needed for maven conversions
-BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 BuildRequires:  unzip
 BuildRequires:  xalan-j2
@@ -82,8 +81,7 @@ ant -Djavac.source=1.8 -Djavac.target=1.8 -Dbuild.compiler=modern -Dhaltonfailur
 
 %install
 mkdir -p %{buildroot}%{_javadir}
-install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir}/ && ln -s %{name}-%{version}.jar %{name}.jar)
+install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # Javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -92,20 +90,13 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 %{SOURCE1} \
-    %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
-%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+%{mvn_install_pom} %{SOURCE1} \
+    %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
 
-%files
+%files -f .mfiles
 %license LICENSE.txt
 %doc README.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
 %doc userguide