[groovy] Update to new upstream release.

[Alexander Kurtakov]

commit 91efce1d993b98d34826f4583397d00ae3f31575
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Mar 22 12:16:15 2011 +0200

    Update to new upstream release.
    
    Drop unneeded patch.

 .gitignore  |    1 +
 groovy.spec |   35 +++++++++++------------------------
 sources     |    2 +-
 3 files changed, 13 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b867d6..973ad24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 groovy-src-1.7.2.zip
 /groovy-src-1.7.7.zip
+groovy-src-1.7.10.zip
diff --git a/groovy.spec b/groovy.spec
index 2c16049..7adc302 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -3,8 +3,8 @@
 # the Requires list.
 
 Name:           groovy
-Version:        1.7.7
-Release:        2%{?dist}
+Version:        1.7.10
+Release:        1%{?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.7.7-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,12 +39,12 @@ 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
 Requires:       apache-commons-logging
-Requires:       ivy
+Requires:       apache-ivy
 Requires:       jline
 Requires:       jsp21
 Requires:       junit
@@ -66,17 +64,15 @@ 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
 
-
 %build
 mkdir -p target/lib/{compile,tools}
 
@@ -92,14 +88,10 @@ build-jar-repository target/lib/compile servlet jsp \
 ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
         createJars javadoc
 
-
 %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,10 +126,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
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -145,25 +133,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_mavendepmapfragdir}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config(noreplace) %{_sysconfdir}/*
 %doc LICENSE.txt NOTICE.txt README.txt 
 
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
 
-
 %post
 %update_maven_depmap
 
-
 %postun
 %update_maven_depmap
 
-
 %changelog
+* Tue Mar 22 2011 Alexander Kurtakov <akurtako at redhat.com> 1.7.10-1
+- Update to upstream release.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index cb2a0a6..39bb6ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-523055502d54e81f461dd8e4ab15d7c5  groovy-src-1.7.7.zip
+3d9a4efb118d19da5b80d5b43f919c38  groovy-src-1.7.10.zip