rpms/jruby/devel .cvsignore, 1.2, 1.3 jruby-dont-include-dependencies-in-jar.patch, 1.1, 1.2 jruby.spec, 1.4, 1.5 sources, 1.2, 1.3
Conrad Meyer (konradm)
fedora-extras-commits at redhat.com
Sat Jul 19 12:50:25 UTC 2008
Author: konradm
Update of /cvs/pkgs/rpms/jruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14247
Modified Files:
.cvsignore jruby-dont-include-dependencies-in-jar.patch
jruby.spec sources
Log Message:
* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.3-1
- Bump to 1.1.3.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Apr 2008 02:38:18 -0000 1.2
+++ .cvsignore 19 Jul 2008 12:49:40 -0000 1.3
@@ -1 +1 @@
-jruby-src-1.1.1.tar.gz
+jruby-src-1.1.3.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jruby-dont-include-dependencies-in-jar.patch 25 Apr 2008 02:38:18 -0000 1.1
+++ jruby-dont-include-dependencies-in-jar.patch 19 Jul 2008 12:49:40 -0000 1.2
@@ -1,43 +1,36 @@
---- build.xml.orig 2008-04-22 17:22:58.000000000 -0700
-+++ build.xml 2008-04-22 17:27:32.000000000 -0700
-@@ -168,34 +168,18 @@
- <patternset refid="java.src.pattern"/>
- </javac>
- </target>
+--- 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>
- <target name="jar-jruby" unless="jar-up-to-date">
-- <antcall target="generate-method-classes" inheritall="true"/>
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0rc7.jar"/>
- <jarjar destfile="${lib.dir}/jruby.jar">
-- <fileset dir="${jruby.classes.dir}">
-- <exclude name="org/jruby/util/ant/**/*.class"/>
-- </fileset>
++ <jar destfile="${lib.dir}/jruby.jar">
+ <fileset dir="${jruby.classes.dir}">
+ <exclude name="org/jruby/util/ant/**/*.class"/>
+ </fileset>
- <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.1.jar"/>
+- <zipfileset src="${build.lib.dir}/jvyamlb-0.2.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"/>
-- <manifest>
-- <attribute name="Built-By" value="${user.name}"/>
-- <attribute name="Main-Class" value="org.jruby.Main"/>
-- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="org.jruby.Main"/>
+ </manifest>
- </jarjar>
-+ <antcall target="generate-method-classes" inheritall="true"/>
-+ <jar destfile="${lib.dir}/jruby.jar">
-+ <fileset dir="${jruby.classes.dir}" />
-+ <manifest>
-+ <attribute name="Built-By" value="${user.name}"/>
-+ <attribute name="Main-Class" value="org.jruby.Main"/>
-+ </manifest>
-+ </jar>
++ </jar>
</target>
<path id="lib.classpath">
Index: jruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/jruby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jruby.spec 22 May 2008 02:31:11 -0000 1.4
+++ jruby.spec 19 Jul 2008 12:49:40 -0000 1.5
@@ -1,12 +1,12 @@
Name: jruby
-Version: 1.1.1
-Release: 7%{?dist}
+Version: 1.1.3
+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.1.tar.gz
+Source0: http://dist.codehaus.org/jruby/jruby-src-1.1.3.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
@@ -15,8 +15,6 @@
# Disagreements with upstream. They want to bundle binary dependencies
# into jruby's jar; we don't.
Patch3: jruby-dont-include-dependencies-in-jar.patch
-# Assuming we want to run the tests.
-Patch5: jruby-add-classpath-for-tests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -29,10 +27,10 @@
BuildRequires: jna
BuildRequires: jna-posix
BuildRequires: joda-time
-BuildRequires: joni
+BuildRequires: joni >= 1.0.3
BuildRequires: jpackage-utils >= 1.5
BuildRequires: junit
-BuildRequires: jvyamlb
+BuildRequires: jvyamlb >= 0.2.2
BuildRequires: objectweb-asm
Requires: bcel
@@ -42,7 +40,7 @@
Requires: jline
Requires: jna
Requires: jna-posix
-Requires: joni
+Requires: joni >= 1.0.3
Requires: jpackage-utils >= 1.5
Requires: jvyamlb
Requires: objectweb-asm
@@ -73,9 +71,6 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
-%patch5 -p0
-
-cp build.xml build.xml.orig
# delete binary .jars.
rm -f build_lib/*.jar
@@ -143,10 +138,7 @@
%files
%defattr(-,root,root,-)
%doc COPYING COPYING.CPL COPYING.GPL COPYING.LGPL
-%doc docs/BeanScriptingFramework docs/CodeConventions.txt
-%doc docs/Glossary.txt docs/Javasupport-highlevel.txt
-%doc docs/Javasupport-lowlevel.txt docs/Javasupport-overview.txt
-%doc docs/README.test docs/release-checklist.txt
+%doc docs/CodeConventions.txt docs/README.test
%attr(0755,root,root) %{_bindir}/%{name}
%attr(0755,root,root) %{_bindir}/jirb
@@ -160,6 +152,9 @@
%changelog
+* Sat Jul 19 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.3-1
+- Bump to 1.1.3.
+
* Wed May 21 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.1-7
- Require joni and jline.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jruby/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Apr 2008 02:38:18 -0000 1.2
+++ sources 19 Jul 2008 12:49:40 -0000 1.3
@@ -1 +1 @@
-94ce5370ada712d2190666bacc6fae21 jruby-src-1.1.1.tar.gz
+f8e094d740fa1b10f3d473a89100afa4 jruby-src-1.1.3.tar.gz
More information about the fedora-extras-commits
mailing list