Update to current packaging guidelines

javacc-maven-plugin.spec

@@ -1,18 +1,18 @@
 Name:           javacc-maven-plugin
 Version:        2.6
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        JavaCC Maven Plugin
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://mojo.codehaus.org/javacc-maven-plugin/ 
+BuildArch:      noarch
+
 #svn export http://svn.codehaus.org/mojo/tags/javacc-maven-plugin-2.6
 #tar cjf javacc-maven-plugin-2.6.tar.bz2 javacc-maven-plugin-2.6
 Source0:        javacc-maven-plugin-2.6.tar.bz2
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+
 Patch0:         javacc-maven-plugin-pom.patch
 
-BuildArch: noarch
 
 BuildRequires: maven-local
 BuildRequires: javacc >= 5.0
@@ -41,47 +41,32 @@ Requires: mojo-parent
 Maven Plugin for processing JavaCC grammar files.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q 
 %patch0 -b .sav
 cp -p %{SOURCE1} .
 
 %build
-mvn-rpmbuild package javadoc:javadoc
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install
 
 %files -f .mfiles
-%{_javadir}/%{name}*
 %doc LICENSE-2.0.txt src/main/resources/NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt src/main/resources/NOTICE
 
 %changelog
+* Mon Jun  9 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-18
+- Update to current packaging guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild