[groovy] Minor changes to reflect guidline changes

[hannes]

commit b8fc1bb6b8551e9ac586873673699ac46c6aed51
Author: johannes lips <johannes at fedorabox.localdomain>
Date:   Wed May 4 09:10:11 2011 +0200

    Minor changes to reflect guidline changes

 groovy-1.6.5-build.patch   |   20 --
 groovy-1.7.7-nojansi.patch |  645 --------------------------------------------
 groovy.spec                |   22 +-
 3 files changed, 9 insertions(+), 678 deletions(-)
---
diff --git a/groovy.spec b/groovy.spec
index 2f7c8a6..0af6b66 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
 
 Name:           groovy
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 Group:          Development/Languages
@@ -14,13 +14,11 @@ Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{vers
 Source1:        groovy-script
 Source2:        groovy-starter.conf
 Source3:        groovy.desktop
-Patch0:         groovy-1.6.5-build.patch
 Patch1:         groovy-1.8.0-nojansi.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
 BuildRequires:  ant
-BuildRequires:  antlr
+BuildRequires:  antlr-tool
 BuildRequires:  ant-antlr
 BuildRequires:  objectweb-asm
 BuildRequires:  bsf
@@ -41,7 +39,7 @@ Requires:       jpackage-utils
 # TODO: Think of splitting them into a separate subpackage
 Requires:       ant
 Requires:       ant-junit
-Requires:       antlr
+Requires:       antlr-tool
 Requires:       objectweb-asm
 Requires:       bsf
 Requires:       apache-commons-cli
@@ -66,14 +64,13 @@ you can use Java.
 Summary:        API Documentation for %{name}
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-
+Requires:       jpackage-utils
 %description javadoc
 JavaDoc documentation for %{name}
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .japierdole
 %patch1 -p1 -b .jansi
 
 
@@ -94,12 +91,10 @@ ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # Code
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -p -m644 target/dist/groovy.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Startup scripts
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -134,8 +129,6 @@ 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}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -145,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_mavendepmapfragdir}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config(noreplace) %{_sysconfdir}/*
 %doc LICENSE.txt NOTICE.txt README.txt 
 
@@ -164,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 04 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.0-2
+- Minor changes to reflect changes to packaging guidelines
+
 * Fri Apr 29 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.0-1
 - Update to 1.8.0