[geronimo-osgi-support] Update to latest packaging guidelines

[Stanislav Ochotnicky]

commit 9dfb7e891b490eda73d3f93a30e399a8865781dd
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Aug 8 16:43:07 2013 +0200

    Update to latest packaging guidelines

 geronimo-osgi-support.spec |   63 ++++++++++++++-----------------------------
 remove-itests.patch        |    7 -----
 use_parent_pom.patch       |   10 -------
 3 files changed, 21 insertions(+), 59 deletions(-)
---
diff --git a/geronimo-osgi-support.spec b/geronimo-osgi-support.spec
index 9ae9583..8a4ebce 100644
--- a/geronimo-osgi-support.spec
+++ b/geronimo-osgi-support.spec
@@ -3,17 +3,12 @@
 
 Name:             geronimo-osgi-support
 Version:          1.0
-Release:          13%{?dist}
+Release:          14%{?dist}
 Summary:          OSGI spec bundle support
-Group:            Development/Libraries
 License:          ASL 2.0 and W3C
 URL:              http://geronimo.apache.org/
 
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
-# Use parent pom files instead of unavailable 'genesis-java5-flava'
-Patch1:           use_parent_pom.patch
-# Remove itests due to unavailable dependencies
-Patch2:           remove-itests.patch
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -23,12 +18,7 @@ BuildRequires:    felix-osgi-core
 BuildRequires:    felix-osgi-compendium
 BuildRequires:    geronimo-parent-poms
 BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-provider-junit4
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         felix-osgi-core
-Requires:         felix-osgi-compendium
 
 Provides:         geronimo-osgi-locator = %{version}-%{release}
 Provides:         geronimo-osgi-registry = %{version}-%{release}
@@ -39,9 +29,7 @@ OSGi-specific lookup in the Geronimo spec projects.
 
 
 %package javadoc
-Group:            Documentation
 Summary:          Javadoc for %{name}
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -50,47 +38,38 @@ This package contains the API documentation for %{name}.
 %setup -q
 iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
 sed -i 's/\r//' LICENSE NOTICE
-%patch1 -p0
-%patch2 -p0
+# Use parent pom files instead of unavailable 'genesis-java5-flava'
+%pom_set_parent org.apache.geronimo.specs:specs:1.4
+
+# Remove itests due to unavailable dependencies
+%pom_disable_module geronimo-osgi-itesta
+%pom_disable_module geronimo-osgi-itestb
+%pom_disable_module geronimo-osgi-registry-itests
+%pom_disable_module geronimo-osgi-locator-itests
 
 %pom_xpath_inject "pom:plugin[pom:artifactId[text()='maven-bundle-plugin']]
                        /pom:configuration/pom:instructions" "
     <Export-Package>!*</Export-Package>" geronimo-osgi-locator
 
+# preserve compatibility locations for jars
+%mvn_file ':{*}' @1
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-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}
-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
-
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{registry}.pom %{registry}.jar
-%add_maven_depmap JPP-%{locator}.pom %{locator}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%mvn_install
+
+%files -f .mfiles
 %doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-14
+- Update to latest packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -130,7 +109,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 * Thu Jul 29 2010 Chris Spike <chris.spike at arcor.de> 1.0-2
 - Fixed wrong EOL encoding in LICENSE
-- Fixed LICENSE file-not-utf8 
+- Fixed LICENSE file-not-utf8
 - Added W3C to 'License:' field
 - Added patch explanations