rpms/groovy/F-13 groovy.spec,1.1,1.2 sources,1.2,1.3

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/groovy/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9326

Modified Files:
	groovy.spec sources 
Log Message:
Merge from devel


Index: groovy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/F-13/groovy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- groovy.spec	9 Dec 2009 18:18:10 -0000	1.1
+++ groovy.spec	17 Feb 2010 08:34:51 -0000	1.2
@@ -3,7 +3,7 @@
 # the Requires list.
 
 Name:           groovy
-Version:        1.6.7
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Agile dynamic language for the Java Platform
 
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  antlr
 BuildRequires:  ant-antlr
-BuildRequires:  asm2
+BuildRequires:  objectweb-asm
 BuildRequires:  bsf
 BuildRequires:  apache-ivy
 BuildRequires:  jline
@@ -41,7 +41,7 @@ Requires:       jpackage-utils
 Requires:       ant
 Requires:       ant-junit
 Requires:       antlr
-Requires:       asm2
+Requires:       objectweb-asm
 Requires:       bsf
 Requires:       jakarta-commons-cli
 Requires:       jakarta-commons-logging
@@ -80,8 +80,9 @@ mkdir -p target/lib/{compile,tools}
 
 # Construct classpath
 build-jar-repository target/lib/compile servlet_2_4_api jsp_2_0_api \
-        asm2/asm2-tree asm2/asm2 asm2/asm2-util \
-        asm2/asm2-analysis antlr ant/ant-antlr antlr \
+        objectweb-asm/asm-tree objectweb-asm/asm \
+        objectweb-asm/asm-util objectweb-asm/asm-analysis \
+        antlr ant/ant-antlr antlr \
         bsf jline xstream ant junit ivy commons-cli
 
 # Build
@@ -146,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.7.0-1
+- New upstream version
+- Use asm 3.1 instead of asm2
+
 * Wed Dec 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6.7-1
 - New upstream version
 - Make Jochen happy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/groovy/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2009 18:18:10 -0000	1.2
+++ sources	17 Feb 2010 08:34:51 -0000	1.3
@@ -1 +1 @@
-f63532d75560f101bf1f40b7a3760228  groovy-src-1.6.7.zip
+72b4b211cec6a8c8e48a04f6d5524c77  groovy-src-1.7.0.zip