rpms/jruby/devel jruby-fix-jruby-start-script.patch, 1.1, 1.2 jruby.spec, 1.5, 1.6

[Conrad Meyer (konradm)]

Author: konradm

Update of /cvs/pkgs/rpms/jruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23697

Modified Files:
	jruby-fix-jruby-start-script.patch jruby.spec 
Log Message:
* Tue Jul 29 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.3-2
- Update jruby-fix-jruby-start-script.patch to work with faster
  class-loading mechanism introduced in JRuby 1.1.2.


jruby-fix-jruby-start-script.patch:

Index: jruby-fix-jruby-start-script.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/jruby-fix-jruby-start-script.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jruby-fix-jruby-start-script.patch	25 Apr 2008 02:38:18 -0000	1.1
+++ jruby-fix-jruby-start-script.patch	30 Jul 2008 03:06:32 -0000	1.2
@@ -1,17 +1,19 @@
---- bin/jruby.orig	2008-04-05 17:59:31.000000000 -0700
-+++ bin/jruby	2008-04-05 19:01:29.000000000 -0700
-@@ -9,10 +9,14 @@
- #
- #   JAVA_HOME     Must point at your Java Development Kit installation.
- #
- # -----------------------------------------------------------------------------
+--- bin/jruby.orig	2008-07-18 22:12:22.000000000 -0700
++++ bin/jruby	2008-07-29 19:55:28.000000000 -0700
+@@ -67,10 +67,16 @@
+         else
+         JRUBY_CP="$j"
+     fi
+ done
  
-+CLASSPATH=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \
-+            objectweb-asm/asm-analysis objectweb-asm/asm-tree joni \
-+            joda-time jline bytelist jna-posix jvyamlb)
++j=$(build-classpath objectweb-asm/asm objectweb-asm/asm-util \
++  objectweb-asm/asm-analysis objectweb-asm/asm-tree joni joda-time jline \
++  bytelist jna-posix jvyamlb)
 +
- cygwin=false
++JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
++
+ if $cygwin; then
+     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
+ fi
  
- # ----- Identify OS we are running under --------------------------------------
- case "`uname`" in
- CYGWIN*) cygwin=true
+ # ----- Set Up The System Classpath -------------------------------------------


Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jruby.spec	19 Jul 2008 12:49:40 -0000	1.5
+++ jruby.spec	30 Jul 2008 03:06:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           jruby
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pure Java implementation of the Ruby interpreter
 
 Group:          Development/Languages
@@ -152,6 +152,10 @@
 
 
 %changelog
+* Tue Jul 29 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.3-2
+- Update jruby-fix-jruby-start-script.patch to work with faster
+  class-loading mechanism introduced in JRuby 1.1.2.
+
 * Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.3-1
 - Bump to 1.1.3.