From 43d849b98db4947cbee250d7734694692e88b80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= Date: Wed, 1 Feb 2023 14:31:11 +0100 Subject: [PATCH] Reorganize subpackages Related: rhbz#2140568 --- jaxb-istack-commons.spec | 47 +++++++++++++--------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/jaxb-istack-commons.spec b/jaxb-istack-commons.spec index 511a99f..d7e874d 100644 --- a/jaxb-istack-commons.spec +++ b/jaxb-istack-commons.spec @@ -14,43 +14,30 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.ant:ant-junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-api) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) %description Code shared between JAXP, JAXB, SAAJ, and JAX-WS projects. -%package -n import-properties-plugin -Summary: istack-commons import properties plugin - -%description -n import-properties-plugin -This package contains the istack-commons import properties Maven Mojo. - -%package -n istack-commons-runtime +%package runtime Summary: istack-commons runtime -%description -n istack-commons-runtime +%description runtime This package contains istack-commons runtime. -%package -n istack-commons-tools -Summary: istack-commons tools - -%description -n istack-commons-tools -This package contains istack-commons tools. - -%package -n istack-commons-test +%package test Summary: istack-commons test -%description -n istack-commons-test +%description test This package contains istack-commons test. +%package tools +Summary: istack-commons tools + +%description tools +This package contains istack-commons tools. + %prep %setup -q @@ -71,12 +58,10 @@ find -name 'module-info.java' -type f -delete %pom_disable_module soimp %pom_disable_module buildtools +%pom_disable_module import-properties-plugin %pom_disable_module maven-plugin %mvn_package :istack-commons __noinstall - -# Compatibility -%mvn_alias :istack-commons-maven-plugin com.sun.istack:maven-istack-commons-plugin popd %build @@ -90,18 +75,16 @@ pushd istack-commons %mvn_install popd -%files -n import-properties-plugin -f istack-commons/.mfiles-import-properties-plugin +%files runtime -f istack-commons/.mfiles-istack-commons-runtime %license LICENSE.md NOTICE.md -%files -n istack-commons-runtime -f istack-commons/.mfiles-istack-commons-runtime +%files test -f istack-commons/.mfiles-istack-commons-test %license LICENSE.md NOTICE.md -%files -n istack-commons-tools -f istack-commons/.mfiles-istack-commons-tools -%license LICENSE.md NOTICE.md -%files -n istack-commons-test -f istack-commons/.mfiles-istack-commons-test +%files tools -f istack-commons/.mfiles-istack-commons-tools %license LICENSE.md NOTICE.md %changelog * Wed Feb 01 2023 Marián Konček - 4.1.1-2 -- Reduce dependencies +- Reduce dependencies, reorganize subpackages * Tue Jan 17 2023 Marian Koncek - 4.1.1-1 - Initial build