rpms/jruby/devel .cvsignore, 1.3, 1.4 jruby-dont-include-dependencies-in-jar.patch, 1.2, 1.3 jruby.spec, 1.6, 1.7 sources, 1.3, 1.4

[Conrad Meyer]

Author: konradm

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

Modified Files:
	.cvsignore jruby-dont-include-dependencies-in-jar.patch 
	jruby.spec sources 
Log Message:
Bump to 1.1.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/.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	29 Nov 2008 02:19:48 -0000	1.4
@@ -1 +1 @@
-jruby-src-1.1.3.tar.gz
+jruby-src-1.1.5.tar.gz

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

Index: jruby-dont-include-dependencies-in-jar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/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	29 Nov 2008 02:19:48 -0000	1.3
@@ -1,38 +1,37 @@
---- 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">
+--- build.xml.orig	2008-09-08 22:55:30.000000000 -0700
++++ build.xml	2008-09-08 23:00:38.000000000 -0700
+@@ -232,32 +232,17 @@
+       <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">
+-      <jarjar destfile="${lib.dir}/jruby.jar" compress="true">
 +      <jar destfile="${lib.dir}/jruby.jar">
-         <fileset dir="${jruby.classes.dir}">
-           <exclude name="org/jruby/util/ant/**/*.class"/>
-         </fileset>
+         <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}/jvyamlb-0.2.3.jar"/>
 -        <zipfileset src="${build.lib.dir}/jline-0.9.93.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>
+-        <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm. at 1"/>
 -      </jarjar>
 +      </jar>
+       <antcall target="_osgify-jruby_" />
    </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"/>
+   <!-- Use Bnd to wrap the JAR generated by jarjar in above task -->
+   <target name="_osgify-jruby_">


Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/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	29 Nov 2008 02:19:48 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           jruby
-Version:        1.1.3
-Release:        2%{?dist}
+Version:        1.1.5
+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/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
@@ -152,6 +152,12 @@
 
 
 %changelog
+* 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/devel/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	29 Nov 2008 02:19:48 -0000	1.4
@@ -1 +1 @@
-f8e094d740fa1b10f3d473a89100afa4  jruby-src-1.1.3.tar.gz
+611d774bc601489b195268de46d490dc  jruby-src-1.1.5.tar.gz