From 113757d838cb03b981ed543b2afffd91a4954dfe Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Aug 24 2013 14:17:07 +0000
Subject: Remove unneeded BR on maven2-common-poms


- Update for newer guidelines

---

diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
index 5cabe72..da5f6a7 100644
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:			antlr-maven-plugin
 Version:		2.2
-Release:		10%{?dist}
+Release:		11%{?dist}
 Summary:		Maven plugin that generates files based on grammar file(s)
 License:		ASL 2.0
 URL:			http://mojo.codehaus.org/antlr-maven-plugin/
@@ -19,32 +19,11 @@ BuildRequires:		java-devel
 BuildRequires:		jpackage-utils
 BuildRequires:		antlr
 BuildRequires:		maven-local
-BuildRequires:		maven-enforcer-plugin
-BuildRequires:		maven-compiler-plugin
-BuildRequires:		maven-install-plugin
-BuildRequires:		maven-jar-plugin
-BuildRequires:		maven-javadoc-plugin
-BuildRequires:		maven-resources-plugin
-BuildRequires:		maven-surefire-plugin
-BuildRequires:		maven-antrun-plugin
-BuildRequires:		maven-clean-plugin
-BuildRequires:		maven-invoker-plugin
-BuildRequires:		maven-plugin-plugin
-BuildRequires:		maven-release-plugin
-BuildRequires:		maven-site-plugin
-BuildRequires:		maven-source-plugin
 BuildRequires:		maven-plugin-bundle
 BuildRequires:		maven-plugin-cobertura
 BuildRequires:		apache-commons-exec
-BuildRequires:		maven2-common-poms
 BuildRequires:		modello
 
-Requires:		antlr
-Requires:       maven
-Requires:		jpackage-utils
-Requires:		apache-commons-exec
-Requires:		java >= 1:1.6.0
-
 Provides:		maven2-plugin-antlr = %{version}-%{release}
 Obsoletes:		maven2-plugin-antlr <= 2.0.8
 
@@ -57,7 +36,6 @@ The Antlr Plugin has two goals:
 %package javadoc
 Summary:		Javadocs for %{name}
 Group:			Documentation
-Requires:		jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -78,32 +56,23 @@ This package contains the API documentation for %{name}.
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
+%mvn_file : %{name}
+
 %build
-mvn-rpmbuild -Dmaven.test.skip=true \
-install javadoc:aggregate
+%mvn_build -- -Dmaven.test.skip=true
 
 %install
-mkdir -p %{buildroot}%{_javadir}
-
-cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/ %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%files -f .mfiles
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Sat Aug 24 2013 Mat Booth <fedora@matbooth.co.uk> - 2.2-11
+- Remove unneeded BR on maven2-common-poms
+- Update for newer guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -135,7 +104,7 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 - Use upstream sources.
 - Adapt to current guidelines.
 
-* Mon Mar  3 2011 Tom Callaway <spot@fedoraproject.org> 2.2-1.20110307svn13719
+* Thu Mar  3 2011 Tom Callaway <spot@fedoraproject.org> 2.2-1.20110307svn13719
 - update to 2.2 tag
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-4.20101012svn12849