[felix-gogo-shell] Changed jar path

[Tomas Radej]

commit 8e8f9a404ea7c214bff31cad963a26adf2fc6fd7
Author: Tomas Radej <tradej at redhat.com>
Date:   Wed Jan 18 09:50:59 2012 +0100

    Changed jar path

 felix-gogo-shell.spec |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index e1a17cf..16b91cf 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -1,9 +1,9 @@
-%global parent    felix-gogo
-%global pkgname   shell
+%global project   felix
+%global bundle    org.apache.felix.gogo.shell
 
-Name:             %{parent}-%{pkgname}
+Name:             %{project}-gogo-shell
 Version:          0.10.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Community OSGi R4 Service Platform Implementation - Basic Commands
 Group:            Development/Tools
 License:          ASL 2.0
@@ -46,7 +46,7 @@ Requires:         jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n org.apache.felix.gogo.shell-%{version}
+%setup -q -n %{bundle}-%{version}
 %patch0 -p1 -F3
 
 %build
@@ -54,13 +54,13 @@ mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/org.apache.felix.gogo.shell-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -d -m 0755 %{buildroot}%{_javadir}/%{project}
+install -pm 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
 
 # pom
 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.%{project}-%{bundle}.pom
+%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -70,7 +70,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %files
 %doc DEPENDENCIES LICENSE NOTICE
 %{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
@@ -78,6 +78,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jan 18 2012 Tomas Radej <tradej at redhat.com> - 0.10.0-2
+- Changed jar path
+
 * Mon Jan 09 2012 Tomas Radej <tradej at redhat.com> - 0.10.0-1
 - Initial packaging