[antlr-maven-plugin/f18] old spec, plus new patch

[Tom Callaway]

commit 636c25eab9d365b43a52615582e95cf2dcdabfca
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Sat Oct 19 00:18:51 2013 +0100

    old spec, plus new patch

 antlr-maven-plugin.spec |   77 +++++++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 33 deletions(-)
---
diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
index 83a0d92..06081ac 100644
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@ -1,6 +1,6 @@
 Name:			antlr-maven-plugin
 Version:		2.2
-Release:		12%{?dist}
+Release:		6%{?dist}.1
 Summary:		Maven plugin that generates files based on grammar file(s)
 License:		ASL 2.0
 URL:			http://mojo.codehaus.org/antlr-maven-plugin/
@@ -20,12 +20,33 @@ BuildArch:		noarch
 BuildRequires:		java-devel
 BuildRequires:		jpackage-utils
 BuildRequires:		antlr
-BuildRequires:		maven-local
+BuildRequires:		maven
+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
 
@@ -38,6 +59,7 @@ 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}.
@@ -48,50 +70,39 @@ This package contains the API documentation for %{name}.
 %patch2 -p1 -b .sink
 %patch3 -p1 -b .fixnpe
 
-# reporting eventually pulls in another antlr and we'd break with weird errors
-%pom_xpath_inject "pom:dependency[pom:artifactId[text()='maven-reporting-impl']]/pom:exclusions" "
-        <exclusion>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-        </exclusion>"
-
 # remove all binary bits
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
-%mvn_file : %{name}
-
 %build
-%mvn_build -- -Dmaven.test.skip=true
+mvn-rpmbuild -Dmaven.test.skip=true \
+install javadoc:aggregate
 
 %install
-%mvn_install
+mkdir -p %{buildroot}%{_javadir}
 
-%files -f .mfiles
+cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
-%files javadoc -f .mfiles-javadoc
-
-%changelog
-* Fri Oct 18 2013 Tom Callaway <spot at fedoraproject.org> - 2.2-12
-- Fix grammar processing bug (bz 1020312)
-  Thanks to Michal Srb
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/ %{buildroot}%{_javadocdir}/%{name}
 
-* Sat Aug 24 2013 Mat Booth <fedora at matbooth.co.uk> - 2.2-11
-- Remove unneeded BR on maven2-common-poms
-- Update for newer guidelines
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-* Mon Mar 04 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2-9
-- Add dependency exclusion for antlr (#911054)
+%files
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}.jar
 
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+%files javadoc
+%{_javadocdir}/%{name}
 
-* Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 2.2-7
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
+%changelog
+* Fri Oct 18 2013 Tom Callaway <spot at fedoraproject.org> - 2.2-6.1
+- Fix grammar processing bug (bz 1020312)
+  Thanks to Michal Srb
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -111,7 +122,7 @@ find -name '*.jar' -exec rm -f '{}' \;
 - Use upstream sources.
 - Adapt to current guidelines.
 
-* Thu Mar  3 2011 Tom Callaway <spot at fedoraproject.org> 2.2-1.20110307svn13719
+* Mon Mar  3 2011 Tom Callaway <spot at fedoraproject.org> 2.2-1.20110307svn13719
 - update to 2.2 tag
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-4.20101012svn12849