msrb pushed to jruby (f22). "Update to latest jruby release (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 12:50:38 UTC 2015
>From f20f9894b57b69e2f8a03c052d85f5cd2c1a851e Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Sun, 22 Feb 2015 12:17:23 +0100
Subject: Update to latest jruby release
- Fix FTBFS (rhbz#1074264)
- Install RPM macros to %{_rpmconfigdir}/macros.d (rhbz#1106973)
Based on spec file prepared by Mo Morsi, see:
https://lists.fedoraproject.org/pipermail/ruby-sig/2014-December/001711.html
diff --git a/.gitignore b/.gitignore
index 89203af..1f1191c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ jruby-src-1.1.6.tar.gz
/jruby-src-1.6.3.tar.gz
/jruby-src-1.7.2.tar.gz
/olabini-yecht-0.0.2-0-g6009fd7.tar.gz
+/jruby-src-1.7.16.2.tar.gz
+/jruby-src-1.7.19.tar.gz
diff --git a/jruby-1.7.4-DSL-should-support-parameter-hash-with-symbol-keys.patch b/jruby-1.7.4-DSL-should-support-parameter-hash-with-symbol-keys.patch
deleted file mode 100644
index 59dcc58..0000000
--- a/jruby-1.7.4-DSL-should-support-parameter-hash-with-symbol-keys.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 80a67f0564f43c979bba6115832128c931173349 Mon Sep 17 00:00:00 2001
-From: Isaiah Peng <issaria at gmail.com>
-Date: Sun, 24 Mar 2013 11:03:57 +0100
-Subject: [PATCH] Fix gh-601 ant DSL should support parameter hash with symbol
- keys
-
----
- lib/ruby/shared/ant/element.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ruby/shared/ant/element.rb b/lib/ruby/shared/ant/element.rb
-index 32dd2cb..e5fe167 100644
---- a/lib/ruby/shared/ant/element.rb
-+++ b/lib/ruby/shared/ant/element.rb
-@@ -74,7 +74,7 @@ def create_element(parent) # See ProjectHelper2.ElementHandler
- def assign_attributes(instance, args)
- wrapper = RuntimeConfigurable.new instance, instance.task_name
- args.each do |key, value|
-- wrapper.set_attribute key, @ant.project.replace_properties(to_string(value))
-+ wrapper.set_attribute to_string(key), @ant.project.replace_properties(to_string(value))
- end
- end
-
---
-1.8.1.6
-
diff --git a/jruby-add-classpath-to-start-script.patch b/jruby-add-classpath-to-start-script.patch
index 7f30681..f4e63aa 100644
--- a/jruby-add-classpath-to-start-script.patch
+++ b/jruby-add-classpath-to-start-script.patch
@@ -1,32 +1,40 @@
---- bin/jruby.sh.orig 2011-05-25 23:01:16.000000000 -0400
-+++ bin/jruby.sh 2011-05-25 23:02:32.000000000 -0400
-@@ -107,6 +107,13 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$J
- JRUBY_ALREADY_ADDED=true
- done
-
-+j=$(build-classpath objectweb-asm4/asm objectweb-asm4/asm-util \
-+ objectweb-asm4/all objectweb-asm4/asm-commons objectweb-asm4/asm-analysis objectweb-asm4/asm-tree bcmail bcprov bsf bytelist \
-+ felix/org.osgi.core invokebinder jansi jcodings jffi jline2 jna jnr-constants jnr-enxio jnr-ffi jnr-netdb jnr-posix jnr-unixsocket \
-+ joda-time joni jzlib nailgun snakeyaml yydebug yecht jruby jruby-yecht 2>/dev/null)
-+
-+JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
-+
-
- # ----- Set Up The System Classpath -------------------------------------------
-
---- bin/jruby.bash.orig 2011-06-02 10:13:58.158447113 -0400
-+++ bin/jruby.bash 2011-06-02 10:14:44.679447018 -0400
-@@ -150,6 +150,14 @@ if $cygwin; then
+diff --git a/bin/jruby.bash b/bin/jruby.bash
+index ff1c532..eb5264d 100755
+--- a/bin/jruby.bash
++++ b/bin/jruby.bash
+@@ -150,6 +150,36 @@ if $cygwin; then
JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
fi
-+j=$(build-classpath objectweb-asm4/asm objectweb-asm4/asm-util \
-+ objectweb-asm4/all objectweb-asm4/asm-commons objectweb-asm4/asm-analysis objectweb-asm4/asm-tree bcmail bcprov bsf bytelist \
-+ felix/org.osgi.core invokebinder jansi jcodings jffi jline2 jna jnr-constants jnr-enxio jnr-ffi jnr-netdb jnr-posix jnr-unixsocket \
-+ joda-time joni jzlib nailgun snakeyaml yydebug yecht jruby jruby-yecht 2>/dev/null)
-+
-+JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
++j=`build-classpath \
++ objectweb-asm/asm \
++ objectweb-asm/asm-commons \
++ objectweb-asm/asm-tree \
++ objectweb-asm/asm-analysis \
++ objectweb-asm/asm-util \
++ joni jnr-netdb/jnr-netdb \
++ jnr-enxio \
++ jnr-x86asm \
++ jnr-unixsocket/jnr-unixsocket \
++ jnr-posix \
++ bytelist \
++ jnr-constants \
++ jcodings \
++ jnr-ffi/jnr-ffi \
++ jffi/jffi \
++ jffi/jffi-native \
++ snakeyaml \
++ commons-codec \
++ base64coder \
++ jzlib \
++ invokebinder \
++ nailgun/nailgun-server \
++ yecht/yecht \
++ joda-time \
++ joda-convert \
++ options/options`
+
++JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
+
# ----- Set Up The System Classpath -------------------------------------------
diff --git a/jruby-dont-include-jar-dependencies-in-build-xml.patch b/jruby-dont-include-jar-dependencies-in-build-xml.patch
deleted file mode 100644
index 16f4490..0000000
--- a/jruby-dont-include-jar-dependencies-in-build-xml.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- build.xml.orig 2012-08-07 09:24:18.000000000 +0200
-+++ build.xml 2012-09-04 11:53:49.018300253 +0200
-@@ -342,48 +342,7 @@
- <echo file="${lib.dir}/native/libs.OK"/>
- </target>
-
-- <property name="jruby.jar.zip.includes" value="
-- ${asm.jar}
-- ${asm.commons.jar}
-- ${asm.util.jar}
-- ${asm.analysis.jar}
-- ${asm.tree.jar}
-- bytelist.jar
-- jnr-constants.jar
-- jline-${jline.version}.jar
-- jcodings.jar
-- joni.jar
-- jnr-netdb.jar
-- jnr-posix.jar
-- jnr-x86asm.jar
-- jnr-ffi.jar
-- jnr-enxio.jar
-- jnr-unixsocket.jar
-- jffi.jar
-- jffi-i386-Linux.jar
-- jffi-x86_64-Linux.jar
-- jffi-Darwin.jar
-- jffi-i386-SunOS.jar
-- jffi-x86_64-SunOS.jar
-- jffi-ppc-AIX.jar
-- jffi-ppc-Linux.jar
-- jffi-ppc64-Linux.jar
-- jffi-sparc-SunOS.jar
-- jffi-sparcv9-SunOS.jar
-- jffi-i386-FreeBSD.jar
-- jffi-x86_64-FreeBSD.jar
-- jffi-i386-OpenBSD.jar
-- jffi-x86_64-OpenBSD.jar
-- jffi-i386-Windows.jar
-- jffi-x86_64-Windows.jar
-- jffi-s390x-Linux.jar
-- joda-time-${joda.time.version}.jar
-- snakeyaml-1.11.jar
-- yecht.jar
-- yydebug.jar
-- nailgun-0.7.1.jar
-- jzlib-1.1.0.jar
-- invokebinder.jar"/>
-+ <property name="jruby.jar.zip.includes" value="cant_leave_this_blank_because_all_files_would_be_used"/>
-
- <target name="jar-jruby" depends="init, compile, unzip-native-libs" unless="jar-up-to-date, jar-jruby.hasrun">
- <jar destfile="${lib.dir}/jruby.jar" compress="true" index="true" update="true">
diff --git a/jruby-executable-add-fedora-java-opts-stub.patch b/jruby-executable-add-fedora-java-opts-stub.patch
index c3d1414..0b0ceb9 100644
--- a/jruby-executable-add-fedora-java-opts-stub.patch
+++ b/jruby-executable-add-fedora-java-opts-stub.patch
@@ -1,22 +1,13 @@
---- bin/jruby.bash.orig 2012-10-04 08:32:06.000000000 +0200
-+++ bin/jruby.bash 2012-10-04 08:36:28.936261891 +0200
-@@ -305,7 +305,7 @@
+diff --git a/bin/jruby.bash b/bin/jruby.bash
+index eb5264d..4816a28 100755
+--- a/bin/jruby.bash
++++ b/bin/jruby.bash
+@@ -338,7 +338,7 @@ ruby_args=("${ruby_args[@]}" "$@")
# Put the ruby_args back into the position arguments $1, $2 etc
set -- "${ruby_args[@]}"
-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
+JAVA_OPTS="$FEDORA_JAVA_OPTS $JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
- JFFI_BOOT=""
- if [ -d "$JRUBY_HOME/lib/native/" ]; then
---- bin/jruby.sh.orig 2012-10-04 08:32:06.000000000 +0200
-+++ bin/jruby.sh 2012-10-04 08:36:38.052228561 +0200
-@@ -253,7 +253,7 @@
- # Put the ruby_args back into the position arguments $1, $2 etc
- set -- "${ruby_args}"
-
--JAVA_OPTS="$JAVA_OPTS $JAVA_VM $JAVA_MEM $JAVA_STACK"
-+JAVA_OPTS="$FEDORA_JAVA_OPTS $JAVA_OPTS $JAVA_VM $JAVA_MEM $JAVA_STACK"
+ JFFI_OPTS="-Djffi.boot.library.path=$JRUBY_HOME/lib/jni"
- JFFI_BOOT=""
- if [ -d "$JRUBY_HOME/lib/native/" ]; then
diff --git a/jruby-no-jar-bundling.patch b/jruby-no-jar-bundling.patch
deleted file mode 100644
index 6970054..0000000
--- a/jruby-no-jar-bundling.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build.xml.orig
-+++ build.xml
-@@ -372,7 +365,6 @@
-
- <target name="add-emma-jars" if="coverage.enabled">
- <jar destfile="${lib.dir}/jruby.jar" compress="true" index="true" update="true">
-- <zipfileset src="${build.lib.dir}/emma.jar"/>
- </jar>
- </target>
-
-@@ -397,15 +390,6 @@
- <exclude name="**/*openssl*/**/*"/>
- <exclude name="org/jruby/gen/org$jruby$ext$openssl*"/>
- </fileset>
-- <zipfileset src="${build.lib.dir}/${asm.jar}"/>
-- <zipfileset src="${build.lib.dir}/${asm.util.jar}"/>
-- <zipfileset src="${build.lib.dir}/${asm.tree.jar}"/>
-- <zipfileset src="${build.lib.dir}/${asm.commons.jar}"/>
-- <zipfileset src="${build.lib.dir}/${asm.analysis.jar}"/>
-- <zipfileset src="${build.lib.dir}/yecht.jar"/>
-- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-- <zipfileset src="${build.lib.dir}/invokebinder.jar"/>
-- <zipfileset src="${build.lib.dir}/yydebug.jar"/>
- <metainf dir="spi">
- <include name="services/**"/>
- </metainf>
diff --git a/jruby-raise-written-chunk-in-spec-to-block.patch b/jruby-raise-written-chunk-in-spec-to-block.patch
deleted file mode 100644
index 01087d0..0000000
--- a/jruby-raise-written-chunk-in-spec-to-block.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 20cd74104cd4e50100f5bf87bac9e7d255af954f
-Author: Bohuslav Kabrda <bkabrda at redhat.com>
-Date: Tue Feb 26 14:53:51 2013 +0100
-
- Update spec/regression/JRUBY-5122_nonblocking_io_spec.rb
-
- Raise socket_channel_might_block to also block on Fedora 19, OpenJDK 7.0.
-
-diff --git a/spec/regression/JRUBY-5122_nonblocking_io_spec.rb b/spec/regression/JRUBY-5122_nonblocking_io_spec.rb
-index 10bdf8c..dc0b269 100644
---- a/spec/regression/JRUBY-5122_nonblocking_io_spec.rb
-+++ b/spec/regression/JRUBY-5122_nonblocking_io_spec.rb
-@@ -214,7 +214,7 @@ describe "nonblocking IO blocking behavior: JRUBY-5122" do
- # Oracle's build block with > 131072 (2**17)
- # On a Windows 7(64) box:
- # Oracle's build does not block (use memory till OOMException)
-- SOCKET_CHANNEL_MIGHT_BLOCK = "a" * (65536 * 4)
-+ SOCKET_CHANNEL_MIGHT_BLOCK = "a" * (219463 * 4)
-
- it "should not block for write" do
- 100.times do # for acceleration; it failed w/o wait_for_accepted call
diff --git a/jruby-remove-builtin-yecht-jar.patch b/jruby-remove-builtin-yecht-jar.patch
deleted file mode 100644
index 2488f3b..0000000
--- a/jruby-remove-builtin-yecht-jar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/org/jruby/Ruby.java.orig 2012-08-07 09:24:18.000000000 +0200
-+++ src/org/jruby/Ruby.java 2012-09-04 12:04:26.348906376 +0200
-@@ -1589,7 +1589,7 @@
- addLazyBuiltin("tempfile.rb", "tempfile", "org.jruby.ext.tempfile.TempfileLibrary");
- addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.ext.fcntl.FcntlLibrary");
- addLazyBuiltin("rubinius.jar", "rubinius", "org.jruby.ext.rubinius.RubiniusLibrary");
-- addLazyBuiltin("yecht.jar", "yecht", "YechtService");
-+ addLazyBuiltin("jruby-yecht.jar", "yecht", "YechtService");
-
- if (is1_9()) {
- addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
diff --git a/jruby-remove-rubygems-dirs-definition.patch b/jruby-remove-rubygems-dirs-definition.patch
index 491bd6e..8d45458 100644
--- a/jruby-remove-rubygems-dirs-definition.patch
+++ b/jruby-remove-rubygems-dirs-definition.patch
@@ -1,6 +1,8 @@
---- rubygems/defaults/jruby.rb.orig 2012-10-04 14:00:24.527540649 +0200
-+++ rubygems/defaults/jruby.rb 2012-10-04 14:01:00.880408183 +0200
-@@ -22,25 +22,6 @@
+diff --git a/lib/ruby/shared/rubygems/defaults/jruby.rb b/lib/ruby/shared/rubygems/defaults/jruby.rb
+index 0fa6467..b555b0f 100644
+--- a/lib/ruby/shared/rubygems/defaults/jruby.rb
++++ b/lib/ruby/shared/rubygems/defaults/jruby.rb
+@@ -36,25 +36,6 @@ module Gem
end
end
diff --git a/jruby-remove-version-from-jarjar-jar-in-specs.patch b/jruby-remove-version-from-jarjar-jar-in-specs.patch
deleted file mode 100644
index 1f301b5..0000000
--- a/jruby-remove-version-from-jarjar-jar-in-specs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spec/java_integration/ant/task_spec.rb.orig 2013-01-04 18:19:00.000000000 +0100
-+++ spec/java_integration/ant/task_spec.rb 2013-02-26 12:33:14.679301003 +0100
-@@ -11,7 +11,7 @@
- property :name => "jar", :value => "spec-test.jar"
- property :name => "dir", :value => "build"
- taskdef :name => "jarjar", :classname => "com.tonicsystems.jarjar.JarJarTask",
-- :classpath => "${basedir}/build_lib/jarjar-1.0.jar"
-+ :classpath => "${basedir}/build_lib/jarjar.jar"
-
- target :jar do
- jar :destfile => "${jar}", :compress => "true", :index => "true" do
diff --git a/jruby-skip-network-tests.patch b/jruby-skip-network-tests.patch
deleted file mode 100644
index e4c5dd0..0000000
--- a/jruby-skip-network-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- test/test_socket.rb.orig 2012-08-07 09:24:18.000000000 +0200
-+++ test/test_socket.rb 2012-09-07 10:02:21.655972716 +0200
-@@ -12,6 +12,7 @@
- # Should this work on windows? JRUBY-6665
- if !WINDOWS
- def test_multicast_send_and_receive
-+ return
- multicast_addr = "225.4.5.6"
- port = 6789
- multicast_msg = "Hello from automated JRuby test suite"
---- test/test_timeout.rb.orig 2013-02-27 10:24:52.000000000 +0100
-+++ test/test_timeout.rb 2013-02-27 10:27:38.529474732 +0100
-@@ -93,6 +93,7 @@
-
- # JRUBY-3928: Net::HTTP doesn't timeout as expected when using timeout.rb
- def test_timeout_socket_connect
-+ return
- assert_raises(Timeout::Error) do
- timeout(0.1) do
- TCPSocket.new('google.com', 12345)
---- test/externals/ruby1.9/openssl/test_integration.rb.orig 2013-01-04 18:19:01.000000000 +0100
-+++ test/externals/ruby1.9/openssl/test_integration.rb 2013-02-27 11:48:16.506902193 +0100
-@@ -26,6 +26,7 @@
- # Warning - this test actually uses the internet connection.
- # If there is no connection, it will fail.
- def test_ca_path_name
-+ return
- uri = URI.parse('https://www.amazon.com')
- http = Net::HTTP.new(uri.host, uri.port)
- http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-@@ -39,6 +40,7 @@
- # Warning - this test actually uses the internet connection.
- # If there is no connection, it will fail.
- def test_ssl_verify
-+ return
- uri = URI.parse('https://www.amazon.com/')
- http = Net::HTTP.new(uri.host, uri.port)
- http.use_ssl = true
-@@ -72,6 +74,7 @@
- # Warning - this test actually uses the internet connection.
- # If there is no connection, it will fail.
- def test_pathlen_does_not_appear
-+ return
- uri = URI.parse('https://www.paypal.com/')
- http = Net::HTTP.new(uri.host, uri.port)
- http.use_ssl = true
-@@ -90,6 +93,7 @@
- # about illegal_parameter when
- # it can't use the cipher string correctly
- def test_cipher_strings
-+ return
- socket = TCPSocket.new('rubyforge.org', 443)
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.cert_store = OpenSSL::X509::Store.new
diff --git a/jruby-yecht-only-build-bindings.patch b/jruby-yecht-only-build-bindings.patch
deleted file mode 100644
index 3af624a..0000000
--- a/jruby-yecht-only-build-bindings.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Only in ./build/classes/ruby: org
-Only in ./build/classes/ruby: YechtService.class
-diff -supr build.xml.orig build.xml
---- build.xml.orig 2009-07-26 06:04:48.000000000 -0400
-+++ build.xml 2011-03-14 16:22:29.000000000 -0400
-@@ -19,6 +19,7 @@
- <path id="ruby.build.classpath">
- <fileset dir="${lib.dir}" includes="yecht*.jar"/>
- <fileset dir="${jruby.lib}" includes="jruby.jar"/>
-+ <fileset dir="${build_lib}" includes="bytelist.jar,jnr-constants.jar,jcodings.jar,yecht.jar"/>
- </path>
-
- <patternset id="java.src.pattern">
-@@ -101,7 +102,7 @@
- </jar>
- </target>
-
-- <target name="ext-ruby-compile" depends="jar" description="Create the JRuby extensions. Requires JRuby to be on the classpath, or in an easy to find place">
-+ <target name="ext-ruby-compile" description="Create the JRuby extensions. Requires JRuby to be on the classpath, or in an easy to find place">
- <javac destdir="${ruby.classes.dir}" debug="true" source="${javac.version}" target="${javac.version}">
- <classpath refid="ruby.build.classpath"/>
- <src path="${ruby.src.dir}"/>
-@@ -111,10 +112,6 @@
-
- <target name="ext-ruby-jar" depends="ext-ruby-compile" description="Create the yecht-ruby.jar file">
- <jar destfile="${lib.dir}/yecht-ruby-0.0.2.jar">
-- <fileset dir="${yecht.classes.dir}">
-- <include name="**/*.class"/>
-- <include name="**/*.properties"/>
-- </fileset>
- <fileset dir="${ruby.classes.dir}">
- <include name="**/*.class"/>
- </fileset>
-diff -supr default.build.properties.orig ./default.build.properties
---- default.build.properties.orig 2009-07-26 06:04:48.000000000 -0400
-+++ ./default.build.properties 2011-03-14 16:17:30.000000000 -0400
-@@ -14,4 +14,5 @@ api.docs.dir=${docs.dir}/api
- release.dir=rels
- javac.version=1.5
- ruby.src.dir=ext/ruby/src/java
--jruby.lib=../jruby/lib
-+jruby.lib=../lib
-+build_lib=../build_lib
-Only in ../../../yecht/olabini-yecht-157cf13/lib: yecht-0.0.2.jar
-Only in ./lib: yecht-ruby-0.0.2.jar
diff --git a/jruby.spec b/jruby.spec
index c88d1f8..9b5a2e5 100644
--- a/jruby.spec
+++ b/jruby.spec
@@ -2,182 +2,82 @@
%global jruby_sitedir %{_prefix}/local/share/%{name}/lib
%global rubygems_dir %{_datadir}/rubygems
-%global yecht_commitversion 6009fd7
-%global yecht_dlversion 0.0.2-0-g%{yecht_commitversion}
-%global yecht_cluster olabini
-
-#%%global preminorver dev
-%global release 6
-%global enable_check 1
-
-%global jar_deps \\\
- objectweb-asm4/asm \\\
- objectweb-asm4/asm-analysis \\\
- objectweb-asm4/asm-commons \\\
- objectweb-asm4/asm-tree \\\
- objectweb-asm4/asm-util \\\
- bcprov \\\
- bcmail \\\
- bsf \\\
- bytelist \\\
- commons-logging \\\
- coro-mock \\\
- invokebinder \\\
- jansi \\\
- jarjar \\\
- jcodings \\\
- jffi \\\
- jline2 \\\
- jna \\\
- jnr-constants \\\
- jnr-enxio \\\
- jnr-ffi \\\
- jnr-netdb \\\
- jnr-posix \\\
- jnr-unixsocket \\\
- joda-time \\\
- joni \\\
- junit \\\
- junit4 \\\
- jzlib \\\
- nailgun \\\
- felix/org.osgi.core \\\
- snakeyaml \\\
- yecht \\\
- yydebug
-
-
Name: jruby
-Version: 1.7.2
-Release: %{?preminorver:0.}%{release}%{?preminorver:.%{preminorver}}%{?dist}.1
+Version: 1.7.19
+Release: 1%{?dist}
Summary: Pure Java implementation of the Ruby interpreter
-Group: Development/Languages
# (CPL or GPLv2+ or LGPLv2+) - JRuby itself
# BSD - some files under lib/ruby/shared
# (GPLv2 or Ruby) - Ruby 1.8 stdlib
# (BSD or Ruby) - Ruby 1.9 stdlib
License: (CPL or GPLv2+ or LGPLv2+) and BSD and (GPLv2 or Ruby) and (BSD or Ruby)
-URL: http://jruby.org/
-BuildArch: noarch
-%if 0%{?preminorver:1}
-Source0: https://github.com/downloads/%{name}/%{name}/%{name}-src-%{version}.%{preminorver}.tar.gz
-%else
+URL: http://jruby.org
Source0: http://jruby.org.s3.amazonaws.com/downloads/%{version}/%{name}-src-%{version}.tar.gz
-%endif
-Source1: http://github.com/%{yecht_cluster}/yecht/tarball/0.0.2/%{yecht_cluster}-yecht-%{yecht_dlversion}.tar.gz
-### Patches for JRuby itself
+
+# Adds all the required jars to boot classpath
+Patch0: jruby-add-classpath-to-start-script.patch
# Adds $FEDORA_JAVA_OPTS, that is dynamically replaced by Fedora specific paths from the specfile
# This way we can use macros for the actual locations and not hardcode them in the patch
-Patch0: jruby-executable-add-fedora-java-opts-stub.patch
-# Adds all the required jars to boot classpath
-Patch1: jruby-add-classpath-to-start-script.patch
-# Following to patches make sure that we bundle no jars
-Patch2: jruby-dont-include-jar-dependencies-in-build-xml.patch
-Patch3: jruby-no-jar-bundling.patch
-# this patch contained the following upstream change
-# https://github.com/jruby/jruby/commit/6c1d41aedfde705c969abf10cf5384e2be69f10a
-# -- now it changes the change to be ok downstream :)
-Patch4: jruby-remove-builtin-yecht-jar.patch
-# We only want to build bindings, yecht is a package on its own
-Patch5: jruby-yecht-only-build-bindings.patch
+Patch1: jruby-executable-add-fedora-java-opts-stub.patch
+# upstream jline JAR bundles jansi, we need to include it explicitly in Fedora
+Patch2: jruby-include-unbundled-jansi.patch
# We don't want any directories defined by JRuby, everything is taken from Fedora's rubygems
-Patch6: jruby-remove-rubygems-dirs-definition.patch
-# Fix Ant compatibility.
-# https://github.com/jruby/jruby/issues/601
-Patch7: jruby-1.7.4-DSL-should-support-parameter-hash-with-symbol-keys.patch
-
-### Patches for tests
-# UDP multicast test hangs
-# http://jira.codehaus.org/browse/JRUBY-6758
-Patch100: jruby-skip-network-tests.patch
-# Fedora has different name for jarjar.jar => downstream only
-Patch101: jruby-remove-version-from-jarjar-jar-in-specs.patch
-# https://github.com/jruby/jruby/pull/551/files
-Patch102: jruby-raise-written-chunk-in-spec-to-block.patch
-
-BuildRequires: ant >= 1.6
-BuildRequires: ant-junit
-BuildRequires: java-devel >= 1.6
-BuildRequires: jpackage-utils >= 1.5
-
-BuildRequires: apache-commons-logging
-BuildRequires: bouncycastle
-BuildRequires: bouncycastle-mail
-BuildRequires: bsf
-BuildRequires: bytelist >= 1.0.8
-BuildRequires: coro-mock
-BuildRequires: felix-osgi-core >= 1.4.0
-BuildRequires: invokebinder
-BuildRequires: jansi
-BuildRequires: jarjar
-BuildRequires: jline2 >= 2.7
-BuildRequires: jffi >= 1.0.10
-BuildRequires: jna
-BuildRequires: jnr-constants
-BuildRequires: jnr-enxio
-BuildRequires: jnr-ffi >= 0.5.10
-BuildRequires: jnr-netdb
-BuildRequires: jnr-posix >= 1.1.8
-BuildRequires: jnr-unixsocket
-BuildRequires: jzlib
-BuildRequires: joda-time
-BuildRequires: joni >= 1.1.2
-BuildRequires: junit4
-BuildRequires: jzlib
-BuildRequires: nailgun
-BuildRequires: objectweb-asm4
-BuildRequires: snakeyaml
-BuildRequires: yydebug
-BuildRequires: yecht
-
-# these normally get installed as gems during the test process
-# TODO: create a condition to be able to test with system gems
-# generally, requiring MRI during JRuby build would be nice to avoid
-#BuildRequires: rubygem(rake)
-#BuildRequires: rubygem(rspec-core)
-#BuildRequires: rubygem(rspec-mocks)
-#BuildRequires: rubygem(rspec-expectations)
-#BuildRequires: rubygem(ruby-debug)
-#BuildRequires: rubygem(ruby-debug-base)
-#BuildRequires: rubygem(columnize)
-
-# Java Requires
-Requires: apache-commons-logging
-Requires: bouncycastle
-Requires: bouncycastle-mail
-Requires: bsf
-Requires: bytelist >= 1.0.8
-Requires: felix-osgi-core >= 1.4.0
-Requires: invokebinder
-Requires: jansi
-Requires: jcodings >= 1.0.1
-Requires: jffi >= 1.0.10
-Requires: jline2 >= 2.7
-Requires: jna
-Requires: jnr-constants
-Requires: jnr-enxio
-Requires: jnr-ffi >= 0.5.10
-Requires: jnr-netdb
-Requires: jnr-posix >= 1.1.8
-Requires: jnr-unixsocket
-Requires: joda-time
-Requires: joni >= 1.1.2
-Requires: jruby-yecht
-Requires: jzlib
-Requires: nailgun
-Requires: objectweb-asm4
-Requires: snakeyaml
-Requires: yydebug
-
-# Other Requires
-Requires: jpackage-utils
-Requires: rubygems
-Requires: rubypick
-
-Provides: ruby(release) = 1.9.1
-Provides: ruby(release) = 1.8
+Patch3: jruby-remove-rubygems-dirs-definition.patch
+
+# BRs generated automatically using xmvn-builddep, sanitized manually
+BuildRequires: maven-local
+BuildRequires: mvn(bsf:bsf)
+BuildRequires: mvn(com.github.jnr:jffi)
+BuildRequires: mvn(com.github.jnr:jffi::native:)
+BuildRequires: mvn(com.github.jnr:jnr-constants)
+BuildRequires: mvn(com.github.jnr:jnr-enxio)
+BuildRequires: mvn(com.github.jnr:jnr-ffi)
+BuildRequires: mvn(com.github.jnr:jnr-netdb)
+BuildRequires: mvn(com.github.jnr:jnr-posix)
+BuildRequires: mvn(com.github.jnr:jnr-unixsocket)
+BuildRequires: mvn(com.github.jnr:jnr-x86asm)
+BuildRequires: mvn(com.headius:coro-mock)
+BuildRequires: mvn(com.headius:invokebinder)
+BuildRequires: mvn(com.headius:options)
+BuildRequires: mvn(com.jcraft:jzlib)
+BuildRequires: mvn(com.martiansoftware:nailgun-server)
+BuildRequires: mvn(jline:jline)
+BuildRequires: mvn(joda-time:joda-time)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.felix:org.apache.felix.framework)
+BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:properties-maven-plugin)
+BuildRequires: mvn(org.jruby.extras:bytelist)
+BuildRequires: mvn(org.jruby.jcodings:jcodings)
+BuildRequires: mvn(org.jruby.joni:joni)
+BuildRequires: mvn(org.jruby:yecht)
+BuildRequires: mvn(org.osgi:org.osgi.core)
+BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm-analysis)
+BuildRequires: mvn(org.ow2.asm:asm-commons)
+BuildRequires: mvn(org.ow2.asm:asm-util)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: mvn(org.yaml:snakeyaml)
+BuildRequires: git
+# unavailable now, see: https://bugzilla.redhat.com/show_bug.cgi?id=1152246
+#BuildRequires: joda-timezones
+
+Provides: ruby(release) = 1.9.3
+Provides: ruby(release) = 1.8.7
# For rubypick
-Provides: ruby(runtime_executable)
+Provides: ruby(runtime_executable)
+
+BuildArch: noarch
+# yecht is in a separate package now
+Obsoletes: %{name}-yecht < %{version}-%{release}
%description
JRuby is a 100% Java implementation of the Ruby programming language.
@@ -185,104 +85,102 @@ It is Ruby for the JVM. JRuby provides a complete set of core "builtin"
classes and syntax for the Ruby language, as well as most of the Ruby
Standard Libraries.
+%package devel
+Summary: JRuby development environment
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Macros for building JRuby-specific libraries.
+
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
%description javadoc
Javadoc for %{name}.
-# yecht / jruby bindings
-# http://jira.codehaus.org/browse/JRUBY-5352
-%package yecht
-Summary: Bindings used to load yecht in jruby
-License: MIT
-Group: Development/Libraries
-BuildRequires: yecht
-Requires: yecht
-Requires: %{name} = %{version}-%{release}
-
-%description yecht
-The bindings for the yecht library for internal use in jruby
+%prep
+%setup -q
-%package devel
-Summary: JRuby development environment
-Group: Development/Languages
-Requires: jruby
-Requires: jpackage-utils
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
-%description devel
-Macros for building JRuby-specific libraries.
+# delete windows specific files
+find -name "*.exe" -delete
+find -name "*.dll" -delete
-%prep
-%setup -q -n %{name}-%{version}%{?preminorver:.%{preminorver}}
+# delete all vcs files
+find -name ".gitignore" -delete
+find -name ".cvsignore" -delete
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch7 -p1
+# remove hidden .document files
+find lib/ruby/ -name "*.document" -delete
-%patch100 -p0
-%patch101 -p0
-%patch102 -p1
+# lib/ruby scripts shouldn't contain shebangs as they are not executable on their own
+find lib/ruby/ -name "*.rb" -exec sed --in-place "s|^#!/usr/local/bin/ruby||" '{}' \;
+find lib/ruby/ -name "*.rb" -exec sed --in-place "s|^#!/usr/bin/env ruby||" '{}' \;
-tar xzvf %{SOURCE1}
-mv %{yecht_cluster}-yecht-%{yecht_commitversion} yecht
+# FIXME: remove when joda-timezones pkg is available in Fedora
+%pom_remove_dep org.jruby:joda-timezones core
-# delete all embedded jars - don't delete test jars!
-find -path './test' -prune -o -path './spec' -prune -o -type f -name '*.jar' -exec rm -f '{}' \;
+# work around "error: package org.osgi.framework.wiring does not exist"
+%pom_add_dep org.apache.felix:org.apache.felix.framework core
-# delete windows specific files
-find -name *.exe -exec rm -f '{}' \;
-find -name *.dll -exec rm -f '{}' \;
+# JDK8 should provide these
+%pom_remove_dep com.headius:unsafe-mock core
+%pom_remove_dep com.headius:jsr292-mock core
-# delete all vcs files
-find -name .gitignore -exec rm -f '{}' \;
-find -name .cvsignore -exec rm -f '{}' \;
+# do not bundle jffi-native
+%pom_remove_plugin :maven-dependency-plugin core
-# replace them with symlinks
-# these sorted to able to check them against new releases easily
-# don't forget to also change these in jruby-add-classpath-to-start-script.patch
-build-jar-repository -s -p build_lib %{jar_deps}
+# we don't have this plugin in fedora
+%pom_remove_plugin :tesla-polyglot-maven-plugin lib
-# required as jruby was shipping the core java tools jar
-ln -s %{_prefix}/lib/jvm/java/lib/tools.jar build_lib/apt-mirror-api.jar
+# a lot of missing "gem" artifacts, skip them for now
+%pom_xpath_remove 'pom:dependencies' lib
-# remove hidden .document files
-find lib/ruby/ -name '*.document' -exec rm -f '{}' \;
+# do not bundle other JARs inside jruby.jar
+%pom_remove_plugin :maven-shade-plugin core
-# change included stdlib to use jruby rather than some arcane ruby install
-find lib/ruby/ -name '*.rb' -exec sed --in-place "s|^#!/usr/local/bin/ruby|#!/usr/bin/env jruby|" '{}' \;
+# generate Requires on jline dependency
+%pom_xpath_replace 'pom:dependency[pom:artifactId[text()="jline"]]/pom:scope' '<scope>compile</scope>' ext/readline
-# lib/ruby scripts shouldn't contain shebangs as they are not executable on their own
-find lib/ruby/ -name '*.rb' -exec sed --in-place "s|^#!/usr/local/bin/ruby||" '{}' \;
-find lib/ruby/ -name '*.rb' -exec sed --in-place "s|^#!/usr/bin/env ruby||" '{}' \;
+# install JARs to %%{_javadir}/%%{name} and symlink them to %%{jruby_vendordir}
+%mvn_file :{jruby-core}:jar:: %{name}/@1 %{jruby_vendordir}/%{name}
+%mvn_file :{ripper}:jar:: %{name}/@1 %{jruby_vendordir}/ruby/shared/@1
+%mvn_file :{readline}:jar:: %{name}/@1 %{jruby_vendordir}/ruby/shared/readline/@1
-# the yecht library needs to be accessible from ruby
-pushd yecht
-mkdir -p lib/ build/classes/ruby
-%patch5 -p0
-popd
+# TODO: build proper org.jruby:jruby artifact
+%mvn_alias org.jruby:jruby-core org.jruby:jruby
%build
-ant
-ant apidocs
-
-# remove bat files
-rm bin/*.bat
-
-pushd yecht
-ant ext-ruby-jar
-popd
+%mvn_build
%install
+%mvn_install
+
install -d -m 755 %{buildroot}%{_datadir}
-install -p -d -m 755 %{buildroot}%{_datadir}/%{name}
-cp -ar lib/ %{buildroot}%{_datadir}/%{name}/ # stdlib + jruby.jar
-cp -ar bin/ %{buildroot}%{_datadir}/%{name}/ # startup scripts
+install -p -d -m 755 %{buildroot}%{_datadir}/%{name}/bin
+
+# stdlib
+cp -ar lib/* %{buildroot}%{jruby_vendordir}/
+
+# symlink jffi .so files (this is pretty ugly :/)
+install -d -m 755 %{buildroot}%{jruby_vendordir}/jni/{arm-Linux,i386-Linux,x86_64-Linux}
+ln -s %{_prefix}/lib/jffi/arm-Linux/libjffi.so %{buildroot}%{jruby_vendordir}/jni/arm-Linux/
+ln -s %{_prefix}/lib/jffi/i386-Linux/libjffi.so %{buildroot}%{jruby_vendordir}/jni/i386-Linux/
+ln -s %{_prefix}/lib64/jffi/x86_64-Linux/libjffi.so %{buildroot}%{jruby_vendordir}/jni/x86_64-Linux/
+
+# jline in Fedora doesn't bundle jansi, we need to symlink it manually
+ln -s `build-classpath jansi/jansi` %{buildroot}%{jruby_vendordir}/ruby/shared/readline/
+xmvn-subst %{buildroot}%{jruby_vendordir}/ruby/shared/readline/
+
+# remove what shouldn't be in lib/ dir
+rm %{buildroot}%{jruby_vendordir}/pom*
+
+# startup scripts
+cp -a bin/{jgem,jirb,jruby} %{buildroot}%{_datadir}/%{name}/bin/
# /usr prefix startup scripts
install -d -m 755 %{buildroot}%{_bindir}
@@ -290,26 +188,22 @@ ln -s %{_datadir}/%{name}/bin/jgem %{buildroot}%{_bindir}/gem-jruby
ln -s %{_datadir}/%{name}/bin/jirb %{buildroot}%{_bindir}/irb-jruby
ln -s %{_datadir}/%{name}/bin/jruby %{buildroot}%{_bindir}/jruby
-## Fedora integration stuff
+# Fedora integration stuff
# modify the JRuby executable to contain Fedora specific paths redefinitons
# we need to modify jruby{,sh,bash} to be sure everything is ok
sed -i 's|$FEDORA_JAVA_OPTS|-Dvendor.dir.general=%{jruby_vendordir}\
-Dsite.dir.general=%{jruby_sitedir}\
-Dvendor.dir.rubygems=%{rubygems_dir}|' \
- %{buildroot}%{_datadir}/%{name}/bin/jruby*
+ %{buildroot}%{_datadir}/%{name}/bin/jruby*
# install JRuby specific bits into system RubyGems
mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
cp -a lib/ruby/shared/rubygems/defaults/* %{buildroot}%{rubygems_dir}/rubygems/defaults
-# Apply patch6 here to not break tests by changing the rubygems dirs
-pushd %{buildroot}%{rubygems_dir}
-patch -p0 < %{PATCH6}
-popd
# Dump the macros into macros.jruby to use them to build other JRuby libraries.
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cat >> %{buildroot}%{_sysconfdir}/rpm/macros.jruby << \EOF
-%%jruby_libdir %%{_datadir}/%{name}/lib/ruby/1.9
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.jruby << \EOF
+%%jruby_libdir %%{_datadir}/%{name}/lib/ruby/2.0
# This is the general location for libs/archs compatible with all
# or most of the Ruby versions available in the Fedora repositories.
@@ -318,85 +212,27 @@ cat >> %{buildroot}%{_sysconfdir}/rpm/macros.jruby << \EOF
%%jruby_vendorarchdir %%{jruby_vendorlibdir}
EOF
-# javadoc
-install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}
-
-# jruby-yecht
-install -d -m 755 %{buildroot}%{_javadir}
-cp yecht/lib/yecht-ruby-0.0.2.jar %{buildroot}%{_datadir}/%{name}-yecht.jar
-ln -s ../../..%{_datadir}/%{name}-yecht.jar %{buildroot}%{_javadir}/%{name}-yecht.jar
-
-# java dir
-install -d -m 755 %{buildroot}%{_javadir}
-ln -s ../../..%{_datadir}/%{name}/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp -a pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-shared.pom
-%add_maven_depmap JPP-%{name}-shared.pom
-cp -a maven/jruby/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# Remove copied bouncycastle jars
-rm %{buildroot}%{_datadir}/%{name}/lib/ruby/shared/bc*.jar
-
-%check
-%if 0%{?enable_check}
-cp yecht/lib/yecht-ruby-0.0.2.jar build_lib/%{name}-yecht.jar
-cp lib/%{name}.jar build_lib/%{name}.jar
-# explicitly set path to jruby.jar and jruby-yecht.jar, as they can't found by "build-classpath" used in bin/jruby
-export JRUBY_CP=$(pwd)/build_lib/jruby.jar:$(pwd)/build_lib/jruby-yecht.jar
-# some tests are not run via bin/jruby, so we have to specify CLASSPATH explictly for them to work
-export CLASSPATH=$(build-classpath %{jar_deps}):$(pwd)/build_lib/jruby.jar:$(pwd)/build_lib/jruby-yecht.jar
-# make sure that we don't install jruby-launcher, as it will first need to be patched upstream
-# to be able to find unbundled jars
-sed -i 's|depends="install-dev-gems,install-jruby-launcher-gem"|depends="install-dev-gems"|' build.xml
-
-# TODO: tests fail because JRuby is split into multiple jars that can't be found on execution
-# of custom built jars in this test, it seems that using proper Class-Path in manifest should fix this
-sed -i 's|test_loading_compiled_ruby_class_from_jar|test_loading_compiled_ruby_class_from_jar\nreturn|' test/test_load_compiled_ruby_class_from_classpath.rb
-
-export LANG=en_US.utf8
-ant test
-%endif
-
-%files -f .mfiles
-%doc COPYING LICENSE.RUBY
-%doc docs/CodeConventions.txt docs/README.test
-
+%files -f .mfiles
+%doc COPYING LICENSE.RUBY LEGAL
%{_bindir}/%{name}
%{_bindir}/gem-jruby
%{_bindir}/irb-jruby
%{_datadir}/%{name}
-# exclude bundled gems
-%exclude %{jruby_vendordir}/ruby/1.9/json*
-%exclude %{jruby_vendordir}/ruby/1.9/rdoc*
-%exclude %{jruby_vendordir}/ruby/1.9/rake*
-%exclude %{jruby_vendordir}/ruby/gems
-# exclude all of the rubygems stuff
-%exclude %{jruby_vendordir}/ruby/shared/*ubygems*
-%exclude %{jruby_vendordir}/ruby/shared/rbconfig
# own the JRuby specific files under RubyGems dir
%{rubygems_dir}/rubygems/defaults/jruby.rb
-# exclude jruby_native.rb that erroneously ended up in .dev tarball
-%exclude %{rubygems_dir}/rubygems/defaults/jruby_native.rb
-%{_javadir}/%{name}.jar
-
-%files javadoc
-%doc COPYING LICENSE.RUBY
-%doc samples
-%{_javadocdir}/%{name}
-
-%files yecht
-%doc yecht/LICENSE
-%{_datadir}/%{name}-yecht.jar
-%{_javadir}/%{name}-yecht.jar
%files devel
-%config(noreplace) %{_sysconfdir}/rpm/macros.jruby
+%{_rpmconfigdir}/macros.d/macros.jruby
+
+%files javadoc -f .mfiles-javadoc
+%doc COPYING LICENSE.RUBY LEGAL
%changelog
+* Tue Dec 16 2014 Mo Morsi <mmorsi at redhat.com> - 1.7.19-1
+- Update to latest jruby release
+- Fix FTBFS (rhbz#1074264)
+- Install RPM macros to %%{_rpmconfigdir}/macros.d (rhbz#1106973)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-6.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 7417626..c858642 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-eb40ba54fbaa6ccae316f77627af8a40 jruby-src-1.7.2.tar.gz
-cd9b5ad417f71ff8277fc91c1aa4deb8 olabini-yecht-0.0.2-0-g6009fd7.tar.gz
+4ceab402137f1bd7fd5233ac788a9b28 jruby-src-1.7.19.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/jruby.git/commit/?h=f22&id=f20f9894b57b69e2f8a03c052d85f5cd2c1a851e
More information about the scm-commits
mailing list