[geronimo-osgi-support] Build with maven 3 - site-plugin no longer works with maven2.

[Alexander Kurtakov]

commit 519128c800898b096cc4904238dd7b17b2d440a3
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 08:56:48 2011 +0200

    Build with maven 3 - site-plugin no longer works with maven2.
    
    - Adapt to current guidelines.

 geronimo-osgi-support.spec |   54 +++++++++++++-------------------------------
 1 files changed, 16 insertions(+), 38 deletions(-)
---
diff --git a/geronimo-osgi-support.spec b/geronimo-osgi-support.spec
index dd1437a..01cd935 100644
--- a/geronimo-osgi-support.spec
+++ b/geronimo-osgi-support.spec
@@ -3,7 +3,7 @@
 
 Name:             geronimo-osgi-support
 Version:          1.0
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          OSGI spec bundle support
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -15,12 +15,11 @@ Source1:          %{name}.depmap
 Patch1:           use_parent_pom.patch
 # Remove itests due to unavailable dependencies
 Patch2:           remove-itests.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2 >= 2.2.1
+BuildRequires:    maven 
 BuildRequires:    felix-osgi-core
 BuildRequires:    felix-osgi-compendium
 BuildRequires:    geronimo-parent-poms
@@ -31,8 +30,6 @@ Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         felix-osgi-core
 Requires:         felix-osgi-compendium
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:         geronimo-osgi-locator = %{version}-%{release}
 Provides:         geronimo-osgi-registry = %{version}-%{release}
@@ -58,29 +55,15 @@ sed -i 's/\r//' LICENSE
 %patch2 -p0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file="%{SOURCE1}" \
         install javadoc:aggregate
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 %{registry}/target/%{registry}-%{version}.jar %{buildroot}%{_javadir}/%{registry}-%{version}.jar
-install -m 644 %{locator}/target/%{locator}-%{version}.jar %{buildroot}%{_javadir}/%{locator}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%add_to_maven_depmap org.apache.geronimo.specs %{name} %{version} JPP %{name}
-%add_to_maven_depmap org.apache.geronimo.specs %{registry} %{version} JPP %{registry}
-%add_to_maven_depmap org.apache.geronimo.specs %{locator} %{version} JPP %{locator}
-
+install -m 644 %{registry}/target/%{registry}-%{version}.jar %{buildroot}%{_javadir}/%{registry}.jar
+install -m 644 %{locator}/target/%{locator}-%{version}.jar %{buildroot}%{_javadir}/%{locator}.jar
 
 # poms
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
@@ -88,34 +71,29 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 install -pm 644 %{registry}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{registry}.pom
 install -pm 644 %{locator}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{locator}.pom
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%add_maven_depmap JPP-%{name}.pom
+%add_maven_depmap JPP-%{registry}.pom %{registry}.jar
+%add_maven_depmap JPP-%{locator}.pom %{locator}.jar
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-5
+- Build with maven 3 - site-plugin no longer works with maven2.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild