From 10b62149773011fda809d112b174b0fc3d9ab466 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Nov 12 2020 16:27:28 +0000
Subject: Stop shipping unused subpackages for tools and parent pom


---

diff --git a/args4j.spec b/args4j.spec
index 0074ada..35fbf15 100644
--- a/args4j.spec
+++ b/args4j.spec
@@ -1,6 +1,6 @@
 Name:           args4j
 Version:        2.33
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Java command line arguments parser
 License:        MIT
 URL:            http://args4j.kohsuke.org
@@ -9,10 +9,12 @@ Source0:        https://github.com/kohsuke/%{name}/archive/%{name}-site-%{versio
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.sun:tools)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.mockito:mockito-all)
+
+# Stopped shipping these unused subpackages in F34
+Obsoletes: %{name}-tools < 2.33-13
+Obsoletes: %{name}-parent < 2.33-13
 
 %description
 args4j is a small Java class library that makes it easy
@@ -24,19 +26,6 @@ to parse command line options/arguments in your CUI application.
 - It is designed to parse javac like options (as opposed to GNU-style
   where ls -lR is considered to have two options l and R)
 
-%package tools
-Summary:        Development-time tool for generating additional artifacits
-
-%description tools
-This package contains args4j development-time tool for generating
-additional artifacits.
-
-%package parent
-Summary:        args4j parent POM
-
-%description parent
-This package contains parent POM for args4j project.
-
 %package javadoc
 Summary:        API documentation for %{name}
 
@@ -46,26 +35,17 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-site-%{version}
 
-# removing classpath addition
-sed -i 's/<addClasspath>true/<addClasspath>false/g' %{name}-tools/pom.xml
-
-# fix ant group id
-sed -i 's/<groupId>ant/<groupId>org.apache.ant/g' %{name}-tools/pom.xml
-
 # removing bundled stuff
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
-%pom_remove_plugin :maven-shade-plugin %{name}-tools
+# Not needed for RPM builds
 %pom_remove_plugin -r :maven-site-plugin
 
-# XMvn cannot generate requires on dependecies with scope "system"
-%pom_xpath_remove "pom:profile[pom:id[text()='jdk-tools-jar']]" %{name}-tools
-%pom_add_dep com.sun:tools %{name}-tools
-
 # we don't need these now
 %pom_disable_module args4j-maven-plugin
 %pom_disable_module args4j-maven-plugin-example
+%pom_disable_module args4j-tools
 
 # Remove reliance on the parent pom
 %pom_remove_parent
@@ -76,9 +56,8 @@ find -name '*.jar' -exec rm -f '{}' \;
 <configuration><source>1.6</source></configuration>
 </plugin>"
 
-# put args4j-tools and parent POM to separate subpackages
-%mvn_package :args4j-tools::{}: %{name}-tools
-%mvn_package :args4j-site::{}: %{name}-parent
+# Don't package the parent pom
+%mvn_package :args4j-site __noinstall
 
 # install also compat symlinks
 %mvn_file ":{*}" %{name}/@1 @1
@@ -92,15 +71,13 @@ find -name '*.jar' -exec rm -f '{}' \;
 %files -f .mfiles
 %license %{name}/LICENSE.txt
 
-%files tools -f .mfiles-%{name}-tools
-
-%files parent -f .mfiles-%{name}-parent
-%license %{name}/LICENSE.txt
-
 %files javadoc -f .mfiles-javadoc
 %license %{name}/LICENSE.txt
 
 %changelog
+* Thu Nov 12 2020 Mat Booth <mat.booth@redhat.com> - 2.33-13
+- Stop shipping unused subpackages for tools and parent pom
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.33-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild