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

[notifications at fedoraproject.org]

>From 81c0d7a1e23069f17f7a800fcb358acfa08dc451 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

Conflicts:
	groovy18.spec

diff --git a/groovy18-script b/groovy18-script
index d6a044d..2efc419 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -75,11 +75,6 @@ BASE_JARS="$BASE_JARS servlet"
 BASE_JARS="$BASE_JARS xstream"
 BASE_JARS="$BASE_JARS jansi"
 
-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 c1d3cfb..88e4ba3 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
 %global majorversion 1.8
 Name:           groovy18
 Version:        1.8.9
-Release:        14%{?dist}
+Release:        15%{?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
@@ -160,6 +160,9 @@ install -p -m644 %{SOURCE2} \
 %doc 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-15
+- Remove -cp hack (Resolves: rhbz#1207586)
+
 * Thu Oct 30 2014 Michal Srb <msrb at redhat.com> - 1.8.9-14
 - Provide also "1.8.9" version (Resolves: rhbz#1158543)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/groovy18.git/commit/?h=f21&id=81c0d7a1e23069f17f7a800fcb358acfa08dc451