From 65c1b45f38e492fbe086284c0de18068a2e5e7d1789bdfbef4dcc6415eb64b66 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 6 Sep 2023 18:48:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-dependency-tree?expand=0&rev=9

---
 maven-dependency-tree.changes |  5 +++++
 maven-dependency-tree.spec    | 35 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/maven-dependency-tree.changes b/maven-dependency-tree.changes
index 9e159f7..a67e167 100644
--- a/maven-dependency-tree.changes
+++ b/maven-dependency-tree.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  6 18:48:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Remove unnecessary dependency on xmvn tools and parent pom
+
 -------------------------------------------------------------------
 Sun Mar 20 20:05:36 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec
index e62496c..1dc40f5 100644
--- a/maven-dependency-tree.spec
+++ b/maven-dependency-tree.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-dependency-tree
 #
-# 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,8 +22,8 @@ Release:        0
 Summary:        Maven dependency tree artifact
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/
-Source0:        https://downloads.apache.org/maven/shared/%{name}-%{version}-source-release.zip
+URL:            https://maven.apache.org/
+Source0:        https://archive.apache.org/dist/maven/shared/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli
@@ -31,7 +31,7 @@ BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  google-guice
 BuildRequires:  guava
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdom2
 BuildRequires:  maven-lib
 BuildRequires:  maven-resolver-api
@@ -47,9 +47,6 @@ BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  xbean
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildArch:      noarch
 
 %description
@@ -69,8 +66,6 @@ cp %{SOURCE1} build.xml
 find -name Maven3DependencyGraphBuilder.java -delete
 %pom_remove_dep org.sonatype.aether:
 
-%pom_remove_plugin :apache-rat-plugin
-
 %build
 mkdir -p lib
 build-jar-repository -s lib \
@@ -97,18 +92,24 @@ build-jar-repository -s lib \
   -Dtest.skip=true \
   jar javadoc
 
-%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
-
 %install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE
-%doc NOTICE
+%license LICENSE NOTICE
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE
-%doc NOTICE
+%files javadoc
+%{_javadocdir}/%{name}
+%license LICENSE NOTICE
 
 %changelog