[groovy] Move to tomcat v7 apis.

[Alexander Kurtakov]

commit 449d949cbcf62ac508884cf6cbf63b92615a0fbc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Mar 21 22:04:34 2012 +0200

    Move to tomcat v7 apis.
    
    - Guideline fixes.

 groovy.spec |   41 ++++++++++++++++-------------------------
 1 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/groovy.spec b/groovy.spec
index e61c39b..4298fb6 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
 
 Name:           groovy
 Version:        1.8.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 Group:          Development/Languages
@@ -24,9 +24,9 @@ BuildRequires:  bsf
 BuildRequires:  apache-ivy
 BuildRequires:  jansi
 BuildRequires:  jline
-BuildRequires:  jsp21
+BuildRequires:  tomcat-jsp-2.2-api
 BuildRequires:  junit
-BuildRequires:  servlet25
+BuildRequires:  tomcat-servlet-3.0-api
 BuildRequires:  xstream
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  desktop-file-utils
@@ -44,12 +44,12 @@ Requires:       objectweb-asm
 Requires:       bsf
 Requires:       apache-commons-cli
 Requires:       apache-commons-logging
-Requires:       ivy
+Requires:       apache-ivy
 Requires:       jansi
 Requires:       jline
-Requires:       jsp21
+Requires:       tomcat-jsp-2.2-api
 Requires:       junit
-Requires:       servlet25
+Requires:       tomcat-servlet-3.0-api
 Requires:       xstream
 
 
@@ -120,17 +120,14 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         %{SOURCE3}
 
 # API Documentation
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 find target -type d |xargs chmod 755
-cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp target/html/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Maven depmap
-install -d $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.codehaus.groovy %{name} %{version} JPP %{name}
-
-
-
+install -d $RPM_BUILD_ROOT%{_mavenpomdir}
+install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %defattr(-,root,root,-)
@@ -139,25 +136,19 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_mavendepmapfragdir}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config(noreplace) %{_sysconfdir}/*
 %doc LICENSE.txt NOTICE.txt README.md 
 
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/*
 
-
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
-
-
 %changelog
+* Wed Mar 21 2012 Alexander Kurtakov <akurtako at redhat.com> 1.8.6-4
+- Move to tomcat v7 apis.
+- Guideline fixes.
+
 * Fri Mar 09 2012 Johannes Lips <hannes at fedoraproject.org> - 1.8.6-3
 - fixed the path of jvm in the startup script