rpms/jruby/devel jruby-dont-include-dependencies-in-jar.patch, 1.3, 1.4 jruby.spec, 1.7, 1.8

[Conrad Meyer]

Author: konradm

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

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

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jruby-dont-include-dependencies-in-jar.patch	29 Nov 2008 02:19:48 -0000	1.3
+++ jruby-dont-include-dependencies-in-jar.patch	29 Nov 2008 02:51:05 -0000	1.4
@@ -1,14 +1,10 @@
---- 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"/>
+--- build.xml.orig	2008-11-28 18:49:13.000000000 -0800
++++ build.xml	2008-11-28 18:49:24.000000000 -0800
+@@ -213,25 +213,10 @@
          <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" compress="true">
-+      <jar destfile="${lib.dir}/jruby.jar">
+       <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"/>
@@ -16,8 +12,10 @@
 -        <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.3.jar"/>
+-        <zipfileset src="${build.lib.dir}/constantine.jar"/>
+-        <zipfileset src="${build.lib.dir}/jvyamlb-0.2.4.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"/>
@@ -27,11 +25,4 @@
            <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>
- 
-   <!-- Use Bnd to wrap the JAR generated by jarjar in above task -->
-   <target name="_osgify-jruby_">
+       </jar>


Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jruby.spec	29 Nov 2008 02:19:48 -0000	1.7
+++ jruby.spec	29 Nov 2008 02:51:05 -0000	1.8
@@ -32,6 +32,7 @@
 BuildRequires:  junit
 BuildRequires:  jvyamlb >= 0.2.2
 BuildRequires:  objectweb-asm
+BuildRequires:  ruby
 
 Requires:       bcel
 Requires:       bsf