[groovy18] use objectweb-asm3

[gil]

commit 0800c2c66a1d87b913ef270038f36e019edafdd0
Author: gil <puntogil at libero.it>
Date:   Fri Nov 15 05:39:22 2013 +0100

    use objectweb-asm3

 groovy18-script |   10 +++++-----
 groovy18.spec   |   13 ++++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/groovy18-script b/groovy18-script
index 32b650e..644fb1c 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -59,16 +59,16 @@ BASE_JARS="$BASE_JARS ant"
 BASE_JARS="$BASE_JARS ant/ant-junit"
 BASE_JARS="$BASE_JARS ant-launcher"
 BASE_JARS="$BASE_JARS antlr"
-BASE_JARS="$BASE_JARS objectweb-asm/asm"
-BASE_JARS="$BASE_JARS objectweb-asm/asm-analysis"
-BASE_JARS="$BASE_JARS objectweb-asm/asm-tree"
-BASE_JARS="$BASE_JARS objectweb-asm/asm-util"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-analysis"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-tree"
+BASE_JARS="$BASE_JARS objectweb-asm3/asm-util"
 BASE_JARS="$BASE_JARS bsf"
 BASE_JARS="$BASE_JARS commons-cli"
 BASE_JARS="$BASE_JARS commons-logging"
 BASE_JARS="$BASE_JARS groovy18-1.8"
 BASE_JARS="$BASE_JARS ivy"
-BASE_JARS="$BASE_JARS jline"
+BASE_JARS="$BASE_JARS jline1/jline-1"
 BASE_JARS="$BASE_JARS jsp"
 BASE_JARS="$BASE_JARS junit"
 BASE_JARS="$BASE_JARS servlet"
diff --git a/groovy18.spec b/groovy18.spec
index dc6492e..058df13 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
 %global majorversion 1.8
 Name:           groovy18
 Version:        1.8.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dynamic language for the Java Platform
 Group:          Development/Languages
 # Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -38,7 +38,7 @@ BuildRequires:  jline1
 BuildRequires:  junit
 BuildRequires:  tomcat-jsp-2.2-api
 BuildRequires:  tomcat-servlet-3.0-api
-BuildRequires:  objectweb-asm
+BuildRequires:  objectweb-asm3
 BuildRequires:  xstream
 
 Requires:       ant
@@ -51,7 +51,7 @@ Requires:       bsf
 Requires:       jansi
 Requires:       jline1
 Requires:       junit
-Requires:       objectweb-asm
+Requires:       objectweb-asm3
 Requires:       tomcat-jsp-2.2-api
 # thanks to Alexander Kurtakov
 Requires:       tomcat-servlet-3.0-api
@@ -110,8 +110,8 @@ mkdir -p target/lib/{compile,tools}
 
 # Construct classpath
 build-jar-repository target/lib/compile servlet jsp \
-        objectweb-asm/asm-tree objectweb-asm/asm \
-        objectweb-asm/asm-util objectweb-asm/asm-analysis \
+        objectweb-asm3/asm-tree objectweb-asm3/asm \
+        objectweb-asm3/asm-util objectweb-asm3/asm-analysis \
         antlr ant/ant-antlr antlr \
         bsf jline1/jline-1 xstream ant junit ivy commons-cli \
         jansi
@@ -175,6 +175,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
+* Fri Nov 15 2013 gil cattaneo <puntogil at libero.it> 1.8.9-6
+- use objectweb-asm3
+
 * Fri Nov 01 2013 Michal Srb <msrb at redhat.com> - 1.8.9-5
 - Switch to jline1 (Resolves: rhbz#1022971)