[java-sig-commits] [plexus-container-default] Fix add_maven_depamp macro call with correct path

[Stanislav Ochotnicky]

commit e898d15b2e45c8f87fe96e36b0c44afd133e0f41
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Aug 26 15:10:17 2011 +0200

    Fix add_maven_depamp macro call with correct path

 plexus-container-default.spec |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/plexus-container-default.spec b/plexus-container-default.spec
index 82d2ff0..789a748 100644
--- a/plexus-container-default.spec
+++ b/plexus-container-default.spec
@@ -28,9 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%global parent plexus
+%global subname container-default
+
 Name:           plexus-container-default
 Version:        1.0
-Release:        0.5.a9%{?dist}
+Release:        0.6.a9%{?dist}
 Epoch:          0
 Summary:        Default Plexus Container
 License:        ASL 2.0 and MIT
@@ -80,14 +83,14 @@ mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
-install -d -m 755 %{buildroot}%{_javadir}/plexus
+install -d -m 755 %{buildroot}%{_javadir}/%{parent}
 install -pm 644 target/%{name}-%{version}-alpha-9-stable-1.jar \
-  %{buildroot}%{_javadir}/plexus/container-default.jar
+  %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -100,8 +103,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %files
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
+%{_javadir}/%{parent}
+%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
@@ -109,6 +112,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Fri Aug 26 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.6.a9
+- Fix add_maven_depamp macro call with correct path
+
 * Wed Aug 24 2011 Tomas Radej <tradej at redhat.com> - 0:1.0-0.5.a9
 - Update to 1.0-alpha-9-stable-1
 - Adapted to building with maven