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

simplify

OBS-URL: https://build.opensuse.org/request/show/1114360
OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb-api?expand=0&rev=20
---
 glassfish-jaxb-api.spec | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index 17273dd..e359595 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -31,9 +31,8 @@ BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  glassfish-activation-api
 BuildRequires:  java-devel >= 9
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
-Requires:       mvn(javax.activation:javax.activation-api)
 BuildArch:      noarch
 
 %description
@@ -62,18 +61,6 @@ cp %{SOURCE1} jaxb-api/build.xml
 %pom_remove_plugin :cobertura-maven-plugin jaxb-api
 %pom_remove_plugin :maven-dependency-plugin jaxb-api
 
-%pom_remove_parent jaxb-api
-%pom_xpath_inject pom:project "
-  <groupId>javax.xml.bind</groupId>
-  <version>%{version}</version>" jaxb-api
-
-%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" "
-    <sourceFileExcludes>
-        <exclude>module-info.java</exclude>
-    </sourceFileExcludes>" jaxb-api
-
-%pom_change_dep ::::: ::::: jaxb-api
-
 %build
 pushd jaxb-api
 mkdir -p lib
@@ -88,7 +75,7 @@ install -m 644 %{bundle}/target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc