[gemini-blueprint] switch to XMvn

[gil]

commit f492dd97634cd6a5964c103d40022ff54d8695c0
Author: gil <puntogil at libero.it>
Date:   Mon Jul 8 06:46:22 2013 +0200

    switch to XMvn

 gemini-blueprint.spec |   67 ++++++++++--------------------------------------
 1 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index c5f0a84..d41b972 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -1,21 +1,18 @@
 %global namedreltag .RELEASE
 %global namedversion %{version}%{?namedreltag}
+%global dotname gemini.blueprint
 Name:          gemini-blueprint
 Version:       1.0.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Reference Implementation of the OSGi Blueprint Service
-Group:         Development/Libraries
 # BSD file - test-support/src/main/java/org/eclipse/gemini/blueprint/test/internal/util/DependencyVisitor.java,
 License:       ASL 2.0 and BSD and EPL
 URL:           http://www.eclipse.org/gemini/
 # https://github.com/glyn/Gemini-Blueprint
-# git clone git://github.com/eclipse/gemini.blueprint gemini-blueprint-1.0.2.RELEASE
-# (cd gemini-blueprint-1.0.2.RELEASE/ && git archive --format=tar --prefix=gemini-blueprint-1.0.2.RELEASE/ 1.0.2.RELEASE | xz > ../gemini-blueprint-1.0.2.RELEASE-src-git.tar.xz)
-Source0:       %{name}-%{namedversion}-src-git.tar.xz
+Source0:       https://github.com/eclipse/gemini.blueprint/archive/%{namedversion}.tar.gz
 # add maven-{bundle,jar}-plugin configuration
 Patch0:        %{name}-%{namedversion}-add-osgi-manifests.patch
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 
 BuildRequires: aopalliance
 BuildRequires: felix-osgi-compendium
@@ -29,13 +26,7 @@ BuildRequires: springframework-context
 BuildRequires: springframework-context-support
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 
 # test deps
@@ -44,19 +35,6 @@ BuildRequires: junit
 BuildRequires: multithreadedtc
 # BuildRequires: springframework-test
 
-Requires:      aopalliance
-Requires:      felix-osgi-compendium
-Requires:      felix-osgi-core
-Requires:      log4j
-Requires:      slf4j
-Requires:      springframework
-Requires:      springframework-aop
-Requires:      springframework-beans
-Requires:      springframework-context
-Requires:      springframework-context-support
-
-Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -76,18 +54,17 @@ NOTE: Eclipse Gemini Blueprint can be considered the
 successor of Spring DM (OSGi) 2.x (http://www.springsource.org/osgi).
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n %{dotname}-%{namedversion}
 %patch0 -p1
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions" "<Bundle-Activator>org.eclipse.gemini.blueprint.extender.internal.boot.ChainActivator</Bundle-Activator>" extender
 
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-bundle-plugin']/pom:configuration/pom:instructions" "
+<Bundle-Activator>org.eclipse.gemini.blueprint.extender.internal.boot.ChainActivator</Bundle-Activator>" extender
 
 find . -name "*.class" -delete
 find . -name "*.jar" -type f -delete
@@ -137,38 +114,22 @@ sed 's/\r//' -i changelog.txt license-apache.txt readme-building.txt readme.txt
 
 %build
 # some test fails for unavailable build deps*
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-# TODO test-support
-for m in core extender mock io; do
-    install -m 644 ${m}/target/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar
-    install -pm 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-%add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-*.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc about.html changelog.txt epl-v10.html license-apache.txt notice.html readme-building.txt readme.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc epl-v10.html license-apache.txt notice.html
 
 %changelog
+* Mon Jul 08 2013 gil cattaneo <puntogil at libero.it> 1.0.2-3
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Tue Apr 23 2013 gil cattaneo <puntogil at libero.it> 1.0.2-2
 - fix License field