[plexus-containers] Correctly place plexus-containers POM in the main package

Mikolaj Izdebski mizdebsk at fedoraproject.org
Fri Mar 22 13:01:01 UTC 2013


commit f38241a0fde75c90056cab012166809c724dffab
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Mar 22 13:55:09 2013 +0100

    Correctly place plexus-containers POM in the main package
    
    %mvn_package gId:aId "" has no effect because it translates to empty
    XML node <targetPackage/> in XMvn configuration.  In XMvn empty values
    are by design treated as non-existent and hence ignored.

 plexus-containers.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/plexus-containers.spec b/plexus-containers.spec
index 90d38cb..7d7184a 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -121,9 +121,6 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
 # plexus-component-api has been merged into plexus-container-default
 %mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api"
 
-# plexus-containers pom goes into main package
-%mvn_package ":plexus-containers" ""
-
 # keep compat symlink for maven's sake
 %mvn_file ":plexus-component-annotations" %{name}/plexus-component-annotations plexus/containers-component-annotations
 
@@ -134,7 +131,8 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
 %mvn_install
 
 
-%files -f .mfiles
+# plexus-containers pom goes into main package
+%files -f .mfiles -f .mfiles-plexus-containers
 %files component-annotations -f .mfiles-plexus-component-annotations
 %files container-default -f .mfiles-plexus-container-default
 %files component-metadata -f .mfiles-plexus-component-metadata
@@ -143,6 +141,9 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Mar 22 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.5.5-11
+- Correctly place plexus-containers POM in the main package
+
 * Thu Mar 21 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.5.5-11
 - Add compat symlinks to keep Maven working
 


More information about the scm-commits mailing list