Browse Source

ruby: update to 1.9.3-p327

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7110 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
72304bc64c
1 changed files with 14 additions and 5 deletions
  1. 14 5
      r/ruby/ruby-vl.spec

+ 14 - 5
r/ruby/ruby-vl.spec

@@ -1,7 +1,7 @@
 %global major_version 1
 %global major_version 1
 %global minor_version 9
 %global minor_version 9
 %global teeny_version 3
 %global teeny_version 3
-%global patch_level 286
+%global patch_level 327
 
 
 %global major_minor_version %{major_version}.%{minor_version}
 %global major_minor_version %{major_version}.%{minor_version}
 
 
@@ -61,7 +61,7 @@ Version: %{ruby_version_patch_level}
 # we cannot reset the release number to 1 even when the main (ruby) version
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # is updated - because it may be that the versions of sub-components don't
 # change.
 # change.
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Group: Development/Languages
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License: (Ruby or BSD) and Public Domain
 License: (Ruby or BSD) and Public Domain
@@ -98,9 +98,12 @@ Patch8: ruby-1.9.3-custom-rubygems-location.patch
 # Add support for installing binary extensions according to FHS.
 # Add support for installing binary extensions according to FHS.
 # https://github.com/rubygems/rubygems/issues/210
 # https://github.com/rubygems/rubygems/issues/210
 Patch9: rubygems-1.8.11-binary-extensions.patch
 Patch9: rubygems-1.8.11-binary-extensions.patch
-# Opening /dev/tty fails with ENXIO (ref: man 2 open) on vbuilder.
-# Let's rescue this
-Patch10: ruby-1.9.3.286-rescue-error-on-open-devtty.patch
+# On koji, network related tests sometimes cause internal server error,
+# ignore these
+Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch
+# http://bugs.ruby-lang.org/issues/show/7312
+# test_str_crypt fails with glibc 2.17
+Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch
 # Make mkmf verbose by default
 # Make mkmf verbose by default
 Patch12: ruby-1.9.3-mkmf-verbose.patch
 Patch12: ruby-1.9.3-mkmf-verbose.patch
 
 
@@ -420,6 +423,7 @@ Emacs上でRubyスクリプトを書くのに便利なモードです.
 %patch8 -p1
 %patch8 -p1
 %patch9 -p1
 %patch9 -p1
 %patch10 -p1
 %patch10 -p1
+%patch11 -p1
 %patch12 -p1
 %patch12 -p1
 
 
 %build
 %build
@@ -876,6 +880,11 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sun Nov 11 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.327-3
+- update to 1.9.3-p327
+- add patch10 to skip network related test
+- add patch11 to skip test_str_crypt (upstream bug)
+
 * Fri Oct 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.286-2
 * Fri Oct 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.286-2
 - fix gem_extdir to include ruby_abi number
 - fix gem_extdir to include ruby_abi number
 - fix macros.ruby to include ruby_abi number
 - fix macros.ruby to include ruby_abi number