From 887750535eb7e3e78ba11e942159ba78a8c2e0ea Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 24 May 2021 16:00:10 -0500
Subject: [PATCH] Drop jaxb-istack-commons-buildtools

---
 jaxb-istack-commons.spec | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/jaxb-istack-commons.spec b/jaxb-istack-commons.spec
index beb91ff..fcace91 100644
--- a/jaxb-istack-commons.spec
+++ b/jaxb-istack-commons.spec
@@ -59,17 +59,6 @@ Summary:        istack-commons import properties plugin
 This package contains the istack-commons import properties Maven Mojo.
 
 
-%package buildtools
-Summary:        istack-commons buildtools
-
-# package renamed in fedora 33, remove in fedora 35
-Provides:       istack-commons-buildtools = %{version}-%{release}
-Obsoletes:      istack-commons-buildtools < %{obs_vr}
-
-%description buildtools
-This package contains istack-commons buildtools.
-
-
 %package runtime
 Summary:        istack-commons runtime
 
@@ -111,6 +100,7 @@ sed -i -e '/Xlint:all/d' pom.xml
 %pom_remove_plugin :spotbugs-maven-plugin
 popd
 
+%pom_disable_module buildtools istack-commons
 %pom_disable_module soimp istack-commons
 %pom_disable_module test istack-commons
 
@@ -138,9 +128,6 @@ popd
 %files -n import-properties-plugin -f istack-commons/.mfiles-import-properties-plugin
 %license LICENSE.md NOTICE.md
 
-%files buildtools -f istack-commons/.mfiles-istack-commons-buildtools
-%license LICENSE.md NOTICE.md
-
 %files runtime -f istack-commons/.mfiles-istack-commons-runtime
 %license LICENSE.md NOTICE.md
 
@@ -150,7 +137,8 @@ popd
 
 %changelog
 * Mon May 24 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.11-4
-- Drop jaxb-istack-commons-soimp and jaxb-istack-commons-test
+- Drop jaxb-istack-commons-buildtools, jaxb-istack-commons-soimp,
+  and jaxb-istack-commons-test
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild