[groovy18] Fix JAR filename (Resolves: rhbz#1166707)

[Michal Srb]

commit 82f79d8e2edfb3f4777f57b76ec72a065d12006d
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Nov 25 09:08:40 2014 +0100

    Fix JAR filename (Resolves: rhbz#1166707)
    
    - Provide also :groovy:1.8.9 in addition to :groovy18:1.8.9
    - Enable gpars at runtime

 groovy18-script |    3 ++-
 groovy18.spec   |   21 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/groovy18-script b/groovy18-script
index d6a044d..b7465f2 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -66,7 +66,7 @@ BASE_JARS="$BASE_JARS objectweb-asm3/asm-util-distroshaded"
 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 groovy-1.8"
 BASE_JARS="$BASE_JARS apache-ivy/ivy"
 BASE_JARS="$BASE_JARS jline1/jline-1"
 BASE_JARS="$BASE_JARS jsp"
@@ -74,6 +74,7 @@ BASE_JARS="$BASE_JARS junit"
 BASE_JARS="$BASE_JARS servlet"
 BASE_JARS="$BASE_JARS xstream"
 BASE_JARS="$BASE_JARS jansi"
+BASE_JARS="$BASE_JARS gpars/gpars"
 
 if [ "$1" = "-cp" -o "$1" = "-classpath" -o "$1" = "--classpath" ] ; then
     ADDITIONAL_JARS="$(echo $2 | tr ':' ' ')"
diff --git a/groovy18.spec b/groovy18.spec
index c8d4404..f06544c 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
 %global majorversion 1.8
 Name:           groovy18
 Version:        1.8.9
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 # Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -73,6 +73,7 @@ Requires:       mvn(jline:jline:1)
 Requires:       mvn(org.fusesource.jansi:jansi)
 # Used for @Grab and Grapes:
 Requires:       mvn(org.apache.ivy:ivy)
+Requires:       mvn(org.codehaus.gpars:gpars)
 
 BuildArch:      noarch
 
@@ -106,14 +107,6 @@ cp %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 # We don't want to generate auto-R on optional dependencies
 %pom_xpath_replace "pom:dependency[pom:optional[text()='true']]/pom:scope" "<scope>provided</scope>"
 
-%mvn_package : %{name}-lib
-%mvn_file : %{name}
-
-# fix aId for gmaven-runtime-1.8
-sed -i "s|<artifactId>groovy</artifactId>|<artifactId>%{name}</artifactId>|" pom.xml
-
-# unavailable runtime dep (for the moment... https://bugzilla.redhat.com/show_bug.cgi?id=854239 )
-%pom_remove_dep org.codehaus.gpars:gpars
 # java 7 apis
 %pom_remove_dep org.livetribe:livetribe-jsr223
 # explicit tomcat apis
@@ -140,9 +133,10 @@ find . -name "*.groovy" -exec sed -i 's|org.objectweb.asm|org.objectweb.distrosh
 %pom_change_dep :asm-analysis :asm-analysis-distroshaded
 %pom_change_dep :asm-tree :asm-tree-distroshaded
 
-%mvn_file : %{name}
+%mvn_package : %{name}-lib
+%mvn_file : groovy %{name}
 
-%mvn_alias : org.codehaus.groovy:%{name}-all
+%mvn_alias : :groovy-all :%{name}-all :%{name}
 %mvn_compat_version : "1.8" "1.8.9"
 
 %build
@@ -196,6 +190,11 @@ install -p -m644 %{SOURCE2} \
 %doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
+* Tue Nov 25 2014 Michal Srb <msrb at redhat.com> - 1.8.9-16
+- Fix JAR filename (Resolves: rhbz#1166707)
+- Provide also :groovy:1.8.9 in addition to :groovy18:1.8.9
+- Enable gpars at runtime
+
 * Wed Oct 29 2014 Michal Srb <msrb at redhat.com> - 1.8.9-15
 - Provide also "1.8.9" version (Resolves: rhbz#1158543)