msrb pushed to groovy18 (f22). "Remove -cp hack"

[notifications at fedoraproject.org]

>From d6aecb3215de47fed2436d4586cd47165fcc5907 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Mon, 30 Mar 2015 10:25:53 +0200
Subject: Remove -cp hack


diff --git a/groovy18-script b/groovy18-script
index 45884fb..cfd811d 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -76,11 +76,6 @@ 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 ':' ' ')"
-    shift 2
-fi
-
 # Set parameters
 set_jvm
 set_classpath $BASE_JARS
diff --git a/groovy18.spec b/groovy18.spec
index d8f5f6c..b87805b 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -6,7 +6,7 @@
 
 Name:           groovy18
 Version:        1.8.9
-Release:        19%{?dist}
+Release:        20%{?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
@@ -194,6 +194,9 @@ install -p -m644 %{SOURCE2} \
 %license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
+* Mon Mar 30 2015 Michal Srb <msrb at redhat.com> - 1.8.9-20
+- Remove -cp hack (Resolves: rhbz#1207586)
+
 * Mon Mar 30 2015 Michal Srb <msrb at redhat.com> - 1.8.9-19
 - Build with servlet 3.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/groovy18.git/commit/?h=f22&id=d6aecb3215de47fed2436d4586cd47165fcc5907