rpms/jruby/devel jruby-dont-include-dependencies-in-jar.patch, 1.4, 1.5

Conrad Meyer konradm at fedoraproject.org
Sun Feb 15 08:48:48 UTC 2009


Author: konradm

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

Modified Files:
	jruby-dont-include-dependencies-in-jar.patch 
Log Message:
Fix patch for 1.1.6.

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jruby-dont-include-dependencies-in-jar.patch	29 Nov 2008 02:51:05 -0000	1.4
+++ jruby-dont-include-dependencies-in-jar.patch	15 Feb 2009 08:48:16 -0000	1.5
@@ -1,8 +1,6 @@
---- 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>
+--- 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}"/>
@@ -11,9 +9,9 @@
 -        <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}/bytelist-1.0.1.jar"/>
 -        <zipfileset src="${build.lib.dir}/constantine.jar"/>
--        <zipfileset src="${build.lib.dir}/jvyamlb-0.2.4.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"/>
@@ -24,5 +22,3 @@
          <manifest>
            <attribute name="Built-By" value="${user.name}"/>
            <attribute name="Main-Class" value="org.jruby.Main"/>
-         </manifest>
-       </jar>




More information about the fedora-extras-commits mailing list