[felix-osgi-foundation] Build with maven 3.

[Alexander Kurtakov]

commit 0c64e50ebddfa89b6fc9a8569e09eef3e6441554
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 22:10:18 2011 +0200

    Build with maven 3.
    
    - Adapt to current guidelines.

 felix-osgi-foundation.spec |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/felix-osgi-foundation.spec b/felix-osgi-foundation.spec
index 9a2d6dd..d125f04 100644
--- a/felix-osgi-foundation.spec
+++ b/felix-osgi-foundation.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-foundation
 Version: 1.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Felix OSGi Foundation EE Bundle
 
 Group:   Development/Libraries
@@ -47,12 +47,7 @@ API documentation for %{name}.
 %setup -q -n %{bundle}-%{version}
 
 %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
@@ -61,35 +56,31 @@ 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
 
 # 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
 %{felixdir}
 %{POM}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-7
+- Build with maven 3.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild