[felix-osgi-compendium] Add org.osgi groupId to depmap

[Stanislav Ochotnicky]

commit 29de6af0835ef2a70ba2ff5f8755d1c781cf86b9
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Sep 22 13:00:29 2011 +0200

    Add org.osgi groupId to depmap
    
    - Packaging fixes

 felix-osgi-compendium.spec |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index 50e87ca..5fb5e6c 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
 
 Group:   Development/Libraries
@@ -21,6 +21,7 @@ BuildArch:      noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
+BuildRequires: maven
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
@@ -37,9 +38,6 @@ Requires: felix-osgi-foundation
 Requires: java >= 1:1.6.0
 Requires: tomcat6-servlet-2.5-api
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
 %description
 OSGi Service Platform Release 4 Compendium Interfaces and Classes.
 
@@ -60,12 +58,7 @@ API documentation for %{name}.
 %patch1 -p1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-%__mkdir_p $MAVEN_REPO_LOCAL
-
-mvn-jpp -e \
-  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-  install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
 # jar
@@ -74,35 +67,32 @@ install -pD -T -m 644 target/%{bundle}-%{version}.jar \
 
 # pom
 install -pD -T -m 644 pom.xml %{buildroot}%{POM}
-%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}
+%add_maven_depmap JPP.felix-%{bundle}.pom felix/%{bundle}.jar -a "org.osgi:%{bundle}"
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 %__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %pre javadoc
 # workaround for rpm bug, can be removed in F-17
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
+%{_mavendepmapfragdir}/%{name}
 %{felixdir}
 %{POM}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 22 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.0-7
+- Add org.osgi groupId to depmap
+- Packaging fixes
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild