rpms/jruby/devel jruby-1.1.5-fix-constantine-namespace.diff, NONE, 1.1 jruby-fix-jruby-start-script.patch, 1.2, 1.3 jruby.spec, 1.8, 1.9

[Conrad Meyer]

Author: konradm

Update of /cvs/pkgs/rpms/jruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28807

Modified Files:
	jruby-fix-jruby-start-script.patch jruby.spec 
Added Files:
	jruby-1.1.5-fix-constantine-namespace.diff 
Log Message:
JRuby 1.1.5 now in

jruby-1.1.5-fix-constantine-namespace.diff:

--- NEW FILE jruby-1.1.5-fix-constantine-namespace.diff ---
diff -U 5 -r jruby-1.1.5.orig/src/org/jruby/platform/Errno.java jruby-1.1.5/src/org/jruby/platform/Errno.java
--- jruby-1.1.5.orig/src/org/jruby/platform/Errno.java	2008-11-03 14:40:58.000000000 -0800
+++ jruby-1.1.5/src/org/jruby/platform/Errno.java	2008-11-28 21:54:12.000000000 -0800
@@ -26,12 +26,12 @@
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/
 
 package org.jruby.platform;
 
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.ConstantSet;
+import constantine.Constant;
+import constantine.ConstantSet;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
diff -U 5 -r jruby-1.1.5.orig/src/org/jruby/Ruby.java jruby-1.1.5/src/org/jruby/Ruby.java
--- jruby-1.1.5.orig/src/org/jruby/Ruby.java	2008-11-03 14:41:15.000000000 -0800
+++ jruby-1.1.5/src/org/jruby/Ruby.java	2008-11-28 21:54:00.000000000 -0800
@@ -37,11 +37,11 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/
 package org.jruby;
 
-import com.kenai.constantine.Constant;
+import constantine.Constant;
 import java.io.ByteArrayInputStream;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jruby-fix-jruby-start-script.patch	30 Jul 2008 03:06:32 -0000	1.2
+++ jruby-fix-jruby-start-script.patch	30 Nov 2008 10:01:02 -0000	1.3
@@ -8,7 +8,7 @@
  
 +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)
++  bytelist jna-posix jvyamlb jcodings constantine)
 +
 +JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
 +


Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jruby.spec	29 Nov 2008 02:51:05 -0000	1.8
+++ jruby.spec	30 Nov 2008 10:01:02 -0000	1.9
@@ -23,6 +23,7 @@
 BuildRequires:  bsf
 BuildRequires:  bytelist
 BuildRequires:  java-devel >= 1:1.6
+BuildRequires:  jcodings
 BuildRequires:  jline
 BuildRequires:  jna
 BuildRequires:  jna-posix
@@ -79,11 +80,32 @@
 rm -f lib/bsf.jar
 rm -f lib/profile.{jar,properties}
 
+# Clean up the native libs
+rm -f lib/native/*/*
+pushd lib/native
+  for subdir in *; do
+    if [ "$subdir" = "${subdir/linux/}" ]; then
+      rmdir "$subdir"
+    else
+      arch=${subdir/*-/}
+      pushd "$subdir"
+        if [ "x$arch" = "xi386" ]; then
+          ln -s /usr/lib/jna/libjnidispatch.so
+#%ifarch x86_64 # this breaks noarch-ness
+        elif [ "x$arch" = "xamd64" ]; then
+          ln -s /usr/lib64/jna/libjnidispatch.so
+#%endif
+        fi
+      popd
+    fi
+  done
+popd
+
 # and replace them with symlinks
-build-jar-repository -s -p build_lib objectweb-asm/asm \
+build-jar-repository -s -p build_lib constantine objectweb-asm/asm \
   objectweb-asm/asm-analysis objectweb-asm/asm-commons \
   objectweb-asm/asm-tree objectweb-asm/asm-util jline jna \
-  joda-time joni junit bsf jna-posix jvyamlb bytelist
+  joda-time joni junit bsf jna-posix jvyamlb bytelist jcodings
 
 # remove hidden .document files
 find lib/ruby/ -name '*.document' -exec rm -f '{}' \;
@@ -97,9 +119,13 @@
 # archdir on jruby
 mkdir lib/ruby/site_ruby/1.8/java
 
+# We don't have source to support accessing the jar this accesses
+rm src/org/jruby/runtime/invokedynamic/InvokeDynamicSupport.java
+rm src/org/jruby/compiler/impl/InvokeDynamicInvocationCompiler.java
+
 
 %build
-ant jar
+LD_LIBRARY_PATH="%{_libdir}/jna" ant jar
 ant create-apidocs