[geronimo-annotation] Update to latest packaging guidelines

[Stanislav Ochotnicky]

commit dde320a16745121fd6168326ade66df54220bdef
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Aug 8 16:17:02 2013 +0200

    Update to latest packaging guidelines

 geronimo-annotation.spec |   42 +++++++++++++++---------------------------
 use_parent_pom.patch     |   10 ----------
 2 files changed, 15 insertions(+), 37 deletions(-)
---
diff --git a/geronimo-annotation.spec b/geronimo-annotation.spec
index 2ba257f..a216b65 100644
--- a/geronimo-annotation.spec
+++ b/geronimo-annotation.spec
@@ -3,14 +3,12 @@
 
 Name:             geronimo-annotation
 Version:          1.0
-Release:          13%{?dist}
+Release:          14%{?dist}
 Summary:          Java EE: Annotation API v1.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
-Patch1:           use_parent_pom.patch
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -28,9 +26,7 @@ Provides:         annotation_api = %{spec_ver}
 This package defines the common annotations.
 
 %package javadoc
-Group:            Documentation
 Summary:          Javadoc for %{name}
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -39,38 +35,30 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{spec_name}-%{version}
 sed -i 's/\r//' LICENSE NOTICE
-%patch1 -p0
-
-%build
-mvn-rpmbuild  install javadoc:javadoc
+%pom_set_parent org.apache.geronimo.specs:specs:1.4
 
-%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}/annotation.jar
+%mvn_alias : org.apache.geronimo.specs:geronimo-annotation_1.0_spec
+%mvn_alias : javax.annotation:jsr250-api
+%mvn_alias : org.eclipse.jetty.orbit:javax.annotation
 
-# 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-annotation_1.0_spec,javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation"
+%mvn_file : %{name} annotation
 
+%build
+%mvn_build
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+%install
+%mvn_install
 
-%files
+%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