rpms/jruby/F-10 .cvsignore, 1.3, 1.4 jruby-dont-include-dependencies-in-jar.patch, 1.2, 1.3 jruby-fix-jruby-start-script.patch, 1.2, 1.3 jruby.spec, 1.6, 1.7 sources, 1.3, 1.4

Wed Feb 18 01:26:32 UTC 2009

Author: konradm

Update of /cvs/pkgs/rpms/jruby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6216

Modified Files:
	.cvsignore jruby-dont-include-dependencies-in-jar.patch 
	jruby-fix-jruby-start-script.patch jruby.spec sources 
Log Message:
Bump to 1.1.6.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	19 Jul 2008 12:49:40 -0000	1.3
+++ .cvsignore	18 Feb 2009 01:26:00 -0000	1.4
@@ -1 +1 @@
-jruby-src-1.1.3.tar.gz
+jruby-src-1.1.6.tar.gz

jruby-dont-include-dependencies-in-jar.patch:

Index: jruby-dont-include-dependencies-in-jar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-10/jruby-dont-include-dependencies-in-jar.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jruby-dont-include-dependencies-in-jar.patch	19 Jul 2008 12:49:40 -0000	1.2
+++ jruby-dont-include-dependencies-in-jar.patch	18 Feb 2009 01:26:00 -0000	1.3
@@ -1,38 +1,24 @@
---- build.xml.orig	2008-07-19 02:20:15.000000000 -0700
-+++ build.xml	2008-07-19 02:20:29.000000000 -0700
-@@ -182,33 +182,19 @@
-       <exec executable="ruby" dir="${basedir}" failifexecutionfails="false">
-         <arg value="tool/snapshot.rb"/>
-         <arg value="${jruby.classes.dir}/org/jruby/jruby.properties"/>
-       </exec>
- 
--      <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0rc7.jar"/>
--      <jarjar destfile="${lib.dir}/jruby.jar">
-+      <jar destfile="${lib.dir}/jruby.jar">
-         <fileset dir="${jruby.classes.dir}">
-           <exclude name="org/jruby/util/ant/**/*.class"/>
-         </fileset>
+--- build.xml.orig	2009-02-15 00:46:12.000000000 -0800
++++ build.xml	2009-02-15 00:46:55.000000000 -0800
+@@ -214,21 +214,6 @@
+             
+       <jar destfile="${lib.dir}/jruby.jar" compress="false">
+         <fileset dir="${jruby.classes.dir}"/>
 -        <zipfileset src="${build.lib.dir}/asm-3.0.jar"/>
 -        <zipfileset src="${build.lib.dir}/asm-commons-3.0.jar"/>
 -        <zipfileset src="${build.lib.dir}/asm-util-3.0.jar"/>
 -        <zipfileset src="${build.lib.dir}/asm-analysis-3.0.jar"/>
 -        <zipfileset src="${build.lib.dir}/asm-tree-3.0.jar"/>
--        <zipfileset src="${build.lib.dir}/bytelist-0.1.jar"/>
--        <zipfileset src="${build.lib.dir}/jvyamlb-0.2.jar"/>
+-        <zipfileset src="${build.lib.dir}/bytelist-1.0.1.jar"/>
+-        <zipfileset src="${build.lib.dir}/constantine.jar"/>
+-        <zipfileset src="${build.lib.dir}/jvyamlb-0.2.5.jar"/>
 -        <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
+-        <zipfileset src="${build.lib.dir}/jcodings.jar"/>
 -        <zipfileset src="${build.lib.dir}/joni.jar"/>
 -        <zipfileset src="${build.lib.dir}/jna-posix.jar"/>
 -        <zipfileset src="${build.lib.dir}/jna.jar"/>
 -        <zipfileset src="${build.lib.dir}/joda-time-1.5.1.jar"/>
--        <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm. at 1"/>
+-        <zipfileset src="${build.lib.dir}/dynalang-0.3.jar"/>
          <manifest>
            <attribute name="Built-By" value="${user.name}"/>
            <attribute name="Main-Class" value="org.jruby.Main"/>
-         </manifest>
--      </jarjar>
-+      </jar>
-   </target>
- 
-   <path id="lib.classpath">
-     <pathelement location="${build.lib.dir}/retroweaver-rt-2.0.5.jar"/>
-     <pathelement location="${build.lib.dir}/backport-util-concurrent.jar"/>

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

Index: jruby-fix-jruby-start-script.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-10/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	18 Feb 2009 01:26:00 -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 jna-posix jvyamlb jcodings constantine)
 +
 +JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
 +


Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-10/jruby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jruby.spec	30 Jul 2008 03:06:32 -0000	1.6
+++ jruby.spec	18 Feb 2009 01:26:00 -0000	1.7
@@ -1,12 +1,11 @@
 Name:           jruby
-Version:        1.1.3
-Release:        2%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        Pure Java implementation of the Ruby interpreter
-
 Group:          Development/Languages
 License:        (CPL or GPLv2+ or LGPLv2+) and ASL 1.1 and MIT and Ruby
 URL:            http://jruby.codehaus.org/
-Source0:        http://dist.codehaus.org/jruby/jruby-src-1.1.3.tar.gz
+Source0:        http://dist.codehaus.org/jruby/%{version}/jruby-src-%{version}.tar.gz
 # This patch is Fedora specific; we set up classpath using build-classpath.
 Patch1:         jruby-fix-jruby-start-script.patch
 # Temporary until upstream realizes they don't support 1.4 and scraps
@@ -16,31 +15,36 @@
 # into jruby's jar; we don't.
 Patch3:         jruby-dont-include-dependencies-in-jar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+#BuildArch:      noarch
 
 BuildRequires:  ant >= 1.6
 BuildRequires:  ant-junit >= 1.6
 BuildRequires:  bsf
 BuildRequires:  bytelist
+BuildRequires:  constantine
 BuildRequires:  java-devel >= 1:1.6
+BuildRequires:  jcodings >= 1.0.1
 BuildRequires:  jline
 BuildRequires:  jna
 BuildRequires:  jna-posix
 BuildRequires:  joda-time
-BuildRequires:  joni >= 1.0.3
+BuildRequires:  joni >= 1.1.2
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  junit
 BuildRequires:  jvyamlb >= 0.2.2
 BuildRequires:  objectweb-asm
+BuildRequires:  ruby
 
 Requires:       bcel
 Requires:       bsf
 Requires:       bytelist
+Requires:       constantine
 Requires:       java >= 1:1.6
+Requires:       jcodings >= 1.0.1
 Requires:       jline
 Requires:       jna
 Requires:       jna-posix
-Requires:       joni >= 1.0.3
+Requires:       joni >= 1.1.2
 Requires:       jpackage-utils >= 1.5
 Requires:       jvyamlb
 Requires:       objectweb-asm
@@ -79,10 +83,13 @@
 rm -f lib/profile.{jar,properties}
 
 # 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
+
+# Clean up the native libs
+rm -rf lib/native/
 
 # remove hidden .document files
 find lib/ruby/ -name '*.document' -exec rm -f '{}' \;
@@ -96,9 +103,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
 
 
@@ -152,6 +163,15 @@
 
 
 %changelog
+* Thu Dec 18 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.6-1
+- Bump to 1.1.6.
+
+* Fri Nov 28 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.5-1
+- Bump to 1.1.5.
+
+* Mon Sep 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.4-1
+- Bump to 1.1.4.
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 12:49:40 -0000	1.3
+++ sources	18 Feb 2009 01:26:00 -0000	1.4
@@ -1 +1 @@
-f8e094d740fa1b10f3d473a89100afa4  jruby-src-1.1.3.tar.gz
+45e796a9cb81113e804468be65d75d7d  jruby-src-1.1.6.tar.gz


