[geronimo-ejb] Update to latest packaging guidelines

[Stanislav Ochotnicky]

commit 079d19152919f6e3b9707c6926ec55d797435654
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Aug 8 16:36:53 2013 +0200

    Update to latest packaging guidelines

 geronimo-ejb.spec    |   64 ++++++++++++++++++--------------------------------
 use_parent_pom.patch |   10 --------
 2 files changed, 23 insertions(+), 51 deletions(-)
---
diff --git a/geronimo-ejb.spec b/geronimo-ejb.spec
index c35d091..fd346b1 100644
--- a/geronimo-ejb.spec
+++ b/geronimo-ejb.spec
@@ -3,15 +3,13 @@
 
 Name:             geronimo-ejb
 Version:          1.0
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          Java EE: EJB API v3.1
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://geronimo.apache.org
 
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{version}/%{spec_name}-%{version}-source-release.tar.gz
-# Use parent pom files instead of unavailable 'genesis-java5-flava'
-Patch1:           use_parent_pom.patch
 
 BuildArch:        noarch
 
@@ -25,25 +23,15 @@ BuildRequires:    annotation_api
 BuildRequires:    jaxrpc_api
 BuildRequires:    geronimo-osgi-locator
 
-Requires:         jta
-Requires:         interceptor_api
-Requires:         annotation_api
-Requires:         jaxrpc_api
-Requires:         geronimo-osgi-locator
-Requires:         java
-Requires:         jpackage-utils
-
 Provides:         ejb_api = %{spec_ver}
 
 %description
-Contains the Enterprise JavaBeans classes and interfaces that define the 
-contracts between the enterprise bean and its clients and between the 
-enterprise bean and the EJB container. 
+Contains the Enterprise JavaBeans classes and interfaces that define the
+contracts between the enterprise bean and its clients and between the
+enterprise bean and the EJB container.
 
 %package javadoc
-Group:            Documentation
 Summary:          Javadoc for %{name}
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -52,37 +40,31 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{spec_name}-%{version}
 sed -i 's/\r//' LICENSE
-%patch1 -p0
+# Use parent pom files instead of unavailable 'genesis-java5-flava'
+%pom_set_parent org.apache.geronimo.specs:specs:1.4
+
+%mvn_alias : org.apache.geronimo.specs:geronimo-ejb_2.1_spec
+%mvn_alias : org.apache.geronimo.specs:geronimo-ejb_3.0_spec
+%mvn_alias : javax.ejb:ejb
+
+%mvn_file : %{name} ejb
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}.jar %{buildroot}%{_javadir}/ejb.jar
-
-# poms
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.geronimo.specs:geronimo-ejb_2.1_spec,org.apache.geronimo.specs:geronimo-ejb_3.0_spec,javax.ejb:ejb"
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%doc LICENSE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Thu Aug  8 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-11
+- Update to latest packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild