From 3ea128a9584532b89ec593e4f926087debe0ea35 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 24 May 2021 14:15:13 -0500 Subject: [PATCH] Drop jaxb-istack-commons-soimp --- jaxb-istack-commons.spec | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/jaxb-istack-commons.spec b/jaxb-istack-commons.spec index bbc95ee..c20114b 100644 --- a/jaxb-istack-commons.spec +++ b/jaxb-istack-commons.spec @@ -1,6 +1,6 @@ Name: jaxb-istack-commons Version: 3.0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: iStack Common Utility Code License: BSD @@ -9,7 +9,6 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(args4j:args4j) BuildRequires: mvn(jakarta.activation:jakarta.activation-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) @@ -82,17 +81,6 @@ Obsoletes: istack-commons-runtime < %{obs_vr} This package contains istack-commons runtime. -%package soimp -Summary: istack-commons soimp - -# package renamed in fedora 33, remove in fedora 35 -Provides: istack-commons-soimp = %{version}-%{release} -Obsoletes: istack-commons-soimp < %{obs_vr} - -%description soimp -This package contains istack-commons soimp. - - %package test Summary: istack-commons test @@ -134,6 +122,7 @@ sed -i -e '/Xlint:all/d' pom.xml %pom_remove_plugin :spotbugs-maven-plugin popd +%pom_disable_module soimp istack-commons %build pushd istack-commons @@ -165,9 +154,6 @@ popd %files runtime -f istack-commons/.mfiles-istack-commons-runtime %license LICENSE.md NOTICE.md -%files soimp -f istack-commons/.mfiles-istack-commons-soimp -%license LICENSE.md NOTICE.md - %files test -f istack-commons/.mfiles-istack-commons-test %license LICENSE.md NOTICE.md @@ -176,6 +162,9 @@ popd %changelog +* Mon May 24 2021 Dogtag PKI Team - 3.0.11-4 +- Drop jaxb-istack-commons-soimp + * Tue Jan 26 2021 Fedora Release Engineering - 3.0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild