[jspc] - convert to mvn_build macro for rawhide (#1013615) - add antlr3-tool BR - pom duplication fix by re

[Peter MacKinnon]

commit 612b3a997f37a6702caa701062116bc2172d2e7f
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Tue Oct 1 13:41:51 2013 -0400

    - convert to mvn_build macro for rawhide (#1013615)
    - add antlr3-tool BR
    - pom duplication fix by removing subpackaging (#1013603)

 jspc.spec |   55 +++++++++----------------------------------------------
 1 files changed, 9 insertions(+), 46 deletions(-)
---
diff --git a/jspc.spec b/jspc.spec
index 1629435..66f1134 100644
--- a/jspc.spec
+++ b/jspc.spec
@@ -4,7 +4,7 @@
 
 Name:          jspc
 Version:       2.0
-Release:       0.7%{dotreltag}%{?dist}
+Release:       0.8%{dotreltag}%{?dist}
 Summary:       Compile JSPs under Maven
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -20,6 +20,7 @@ BuildRequires: maven-local
 
 BuildRequires: apache-resource-bundles
 BuildRequires: ant
+BuildRequires: antlr3-tool
 BuildRequires: fusesource-pom
 BuildRequires: mvn(commons-lang:commons-lang)
 BuildRequires: mvn(org.apache.maven.shared:file-management)
@@ -47,33 +48,6 @@ your WAR file. Version 2 of the JSP compilation support includes a
 pluggable JSP compiler implementation, which currently allows different
 versions of the Tomcat Jasper compiler to be used as needed.
 
-%package compilers
-Group:         Development/Libraries
-Summary:       JSPC Compilers
-Requires:      %{name} = %{version}-%{release}
-
-%description compilers
-%{summary}.
-
-%package compiler-tomcat6
-Group:         Development/Libraries
-Summary:       JSPC Compiler for Tomcat6
-Requires:      tomcat
-Requires:      %{name}-compilers = %{version}-%{release}
-
-%description compiler-tomcat6
-%{summary}.
-
-%package -n jspc-maven-plugin
-Group:         Development/Libraries
-Summary:       JSPC Maven Plugin
-Requires:      %{name}-compiler-tomcat6 = %{version}-%{release}
-Requires:      mvn(commons-lang:commons-lang)
-Requires:      mvn(org.apache.maven.shared:file-management)
-
-%description -n jspc-maven-plugin
-%{summary}.
-
 %package javadoc
 Group:         Documentation
 Summary:       Javadoc for %{name}
@@ -155,15 +129,14 @@ sed -i 's|<artifactId>jasper-jdt</artifactId>|<artifactId>tomcat-jasper-jdt</art
 # get rid of gmaven...
 %pom_remove_dep org.codehaus.groovy.maven:gmaven-mojo pom.xml
 %pom_remove_plugin org.codehaus.groovy.maven:gmaven-plugin pom.xml
-%pom_add_dep 	org.apache.ant:ant jspc-compilers/jspc-compiler-tomcat6/pom.xml
+%pom_add_dep org.apache.ant:ant jspc-compilers/jspc-compiler-tomcat6/pom.xml
 
 #...replace with ant groovyc task
 # have to patch due to some $ substitution problems
 %patch0 -p2
 
 %build
-
-mvn-build
+%mvn_build
 
 # http://jira.codehaus.org/browse/GMAVEN-68
 # gmaven-runtime 1.8 doesn't generate plugin descriptor
@@ -205,24 +178,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadir}/%{name}/%{name}-compiler-api.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}.pom
 %{_mavenpomdir}/JPP.%{name}-%{name}-compiler-api.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files compilers
-%dir %{_javadir}/%{name}
 %{_mavenpomdir}/JPP.%{name}-%{name}-compilers.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files compiler-tomcat6
-%dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}-compiler-tomcat6.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-compiler-tomcat6.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files maven-plugin
-%dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}-maven-plugin.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-maven-plugin.pom
 %{_mavendepmapfragdir}/%{name}
@@ -233,6 +191,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 %changelog
+* Mon Sep 30 2013 Peter MacKinnon <pmackinn at redhat.com> 2.0-0.8.alpha.3
+- convert to mvn_build macro for rawhide (#1013615)
+- add antlr3-tool BR
+- pom duplication fix by removing subpackaging (#1013603)
+
 * Wed Aug 07 2013 Peter MacKinnon <pmackinn at redhat.com> 2.0-0.7.alpha.3
 - Replaced gmaven with ant+groovyc
 - plexus-containers-container-default update