From 490502261a67845fdd21eaa4a3e68b76cbf25762 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:32:52 +0200 Subject: [PATCH] Merge inject and plexus subpackages --- sisu.spec | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/sisu.spec b/sisu.spec index 67c735a..c6f93d0 100644 --- a/sisu.spec +++ b/sisu.spec @@ -1,7 +1,7 @@ Name: sisu Epoch: 1 Version: 0.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Eclipse dependency injection framework # sisu is EPL-1.0 # bundled asm is BSD @@ -41,18 +41,7 @@ Provides: bundled(objectweb-asm) Java dependency injection framework with backward support for plexus and bean style dependency injection. -%package inject -Summary: Sisu inject - -%description inject -This package contains %{summary}. - -%package plexus -Summary: Sisu Plexus - -%description plexus -This package contains %{summary}. - +%{?module_package} %{?javadoc_package} %prep @@ -71,7 +60,7 @@ cp %{SOURCE102} sisu-plexus/pom.xml %pom_xpath_set -r /pom:project/pom:version %{version} %mvn_file ":{*}" @1 -%mvn_package ":*{inject,plexus}" @1 +%mvn_package ":*{inject,plexus}" %mvn_package : __noinstall %mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus @@ -81,12 +70,13 @@ cp %{SOURCE102} sisu-plexus/pom.xml %install %mvn_install -%files inject -f .mfiles-inject +%files -n %{?module_prefix}%{name} -f .mfiles %license sisu-inject/LICENSE.txt -%files plexus -f .mfiles-plexus - %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 1:0.3.3-8 +- Merge inject and plexus subpackages + * Fri May 24 2019 Mikolaj Izdebski - 1:0.3.3-7 - Mass rebuild for javapackages-tools 201901