[groovy] Groovy needs asm3

Michal Srb msrb at fedoraproject.org
Fri Dec 6 08:19:52 UTC 2013


commit 1ef54835c562928f84eaadc100468aa9bccc90bd
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Dec 6 09:19:31 2013 +0100

    Groovy needs asm3

 groovy-script |    8 ++++----
 groovy.spec   |   13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/groovy-script b/groovy-script
index c79f8ab..fec1335 100644
--- a/groovy-script
+++ b/groovy-script
@@ -59,10 +59,10 @@ 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"
diff --git a/groovy.spec b/groovy.spec
index 6ca7250..f1435a7 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
 
 Name:           groovy
 Version:        1.8.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 Group:          Development/Languages
@@ -28,7 +28,7 @@ BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  antlr-tool
 BuildRequires:  ant-antlr
-BuildRequires:  objectweb-asm
+BuildRequires:  objectweb-asm3
 BuildRequires:  bsf
 BuildRequires:  apache-ivy
 BuildRequires:  jansi
@@ -50,7 +50,7 @@ Requires:       jpackage-utils
 Requires:       ant
 Requires:       ant-junit
 Requires:       antlr-tool
-Requires:       objectweb-asm
+Requires:       objectweb-asm3
 Requires:       bsf
 Requires:       apache-commons-cli
 Requires:       apache-commons-logging
@@ -93,8 +93,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 xstream ant junit ivy commons-cli \
         jansi
@@ -168,6 +168,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 Dec 06 2013 Michal Srb <msrb at redhat.com> - 1.8.9-7
+- Groovy needs asm3
+
 * Thu Oct 24 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8.9-6
 - Migrate from jline to jline1
 - Resolves: rhbz#1022969


More information about the scm-commits mailing list