[rhq-plugin-annotations] Fix FTBFS (Resolves: rhbz#1107022)

[Michal Srb]

commit 4059a34a078dcb9a7bb1ac3558885784b8e9e8c6
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Feb 19 09:52:13 2015 +0100

    Fix FTBFS (Resolves: rhbz#1107022)
    
    - Adapt to current packaging guidelines

 rhq-plugin-annotations.spec |   47 +++++++++++--------------------------------
 1 files changed, 12 insertions(+), 35 deletions(-)
---
diff --git a/rhq-plugin-annotations.spec b/rhq-plugin-annotations.spec
index 1f4e0df..3b970b0 100644
--- a/rhq-plugin-annotations.spec
+++ b/rhq-plugin-annotations.spec
@@ -1,8 +1,7 @@
 Name:             rhq-plugin-annotations
 Version:          3.0.4
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          RHQ plugin annotations
-Group:            Development/Libraries
 License:          GPL and LGPLv2+
 URL:              http://rhq-project.org
 
@@ -15,23 +14,13 @@ Patch0:           rhq-plugin-annotations-%{version}-pom.patch
 
 BuildArch:        noarch
 
-BuildRequires:    java-devel
-BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-
-Requires:         jpackage-utils
 
 %description
-Annotations to help generate RHQ plugin descriptors
+Annotations to help generate RHQ plugin descriptors.
 
 %package javadoc
 Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -40,35 +29,23 @@ This package contains the API documentation for %{name}.
 %setup -q -n pluginAnnotations
 %patch0 -p1
 
+%mvn_file : %{name}/%{name} %{name}
+
 %build
-mvn-rpmbuild -Dproject.build.sourceEncoding=iso8859-1  install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=iso8859-1
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/rhq-pluginAnnotations-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Feb 19 2015 Michal Srb <msrb at redhat.com> - 3.0.4-9
+- Fix FTBFS (Resolves: rhbz#1107022)
+- Adapt to current packaging guidelines
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild