rpms/ruby/F-11 ruby-1.8.6-p383-rubyprefix.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 import.log, 1.6, 1.7 ruby.spec, 1.138, 1.139 sources, 1.31, 1.32 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.2, NONE ruby-rubyprefix.patch, 1.5, NONE
Jeroen van Meeuwen
kanarip at fedoraproject.org
Thu Oct 22 15:34:22 UTC 2009
Author: kanarip
Update of /cvs/pkgs/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9285/F-11
Modified Files:
.cvsignore import.log ruby.spec sources
Added Files:
ruby-1.8.6-p383-rubyprefix.patch
Removed Files:
ruby-1.8.6-p369-ri-gem_multipath.patch ruby-rubyprefix.patch
Log Message:
1.8.6.383-1.fc11
ruby-1.8.6-p383-rubyprefix.patch:
/configure.in.orig |only
/configure.in.rej |only
configure.in | 28 +++++++++++++++++++++++-----
mkconfig.rb | 6 +++---
4 files changed, 26 insertions(+), 8 deletions(-)
--- NEW FILE ruby-1.8.6-p383-rubyprefix.patch ---
diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
--- ruby-1.8.6-p383.0-deadcode/configure.in 2009-07-20 15:24:22.000000000 +0200
+++ ruby-1.8.6-p383/configure.in 2009-10-22 16:37:13.729623476 +0200
@@ -1613,6 +1613,13 @@
rubyw_install_name="$RUBYW_INSTALL_NAME"
;;
esac
+
+AC_ARG_WITH(ruby-prefix,
+ AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+ ,,
+ with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
RUBY_LIB_PREFIX="/lib/ruby"
@@ -1621,20 +1628,30 @@
RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
;;
esac
+else
+ RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
AC_ARG_WITH(sitedir,
[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval],
[sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+_fc_sitedir="\$(DESTDIR)${sitedir}"
+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
RUBY_SITE_LIB_PATH="$SITE_DIR";;
*)
- RUBY_SITE_LIB_PATH="$SITE_DIR";;
+ RUBY_SITE_LIB_PATH="$SITE_DIR";
+ RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
@@ -1644,6 +1661,7 @@
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl
@@ -1652,7 +1670,7 @@
arch="fat-${target_os}"
AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
- "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+ "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
"${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1667,8 +1685,8 @@
*) sitearch="${arch}" ;;
esac
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
AC_ARG_WITH(search-path,
[ --with-search-path=DIR specify the additional search path],
Only in ruby-1.8.6-p383/: configure.in.orig
Only in ruby-1.8.6-p383/: configure.in.rej
diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb 2008-06-07 18:37:10.000000000 +0200
+++ ruby-1.8.6-p383/mkconfig.rb 2009-10-22 16:30:55.776872493 +0200
@@ -139,10 +139,10 @@
print(*v_others)
print <<EOS
CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
- CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
- CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+ CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+ CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
- CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+ CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
CONFIG["topdir"] = File.dirname(__FILE__)
MAKEFILE_CONFIG = {}
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore 23 Jun 2009 12:40:23 -0000 1.32
+++ .cvsignore 22 Oct 2009 15:34:21 -0000 1.33
@@ -1,4 +1,4 @@
ruby-refm-rdp-1.8.2-ja-html.tar.gz
rubyfaq-990927.tar.gz
rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p369.tar.bz2
+ruby-1.8.6-p383.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 23 Jun 2009 12:40:23 -0000 1.6
+++ import.log 22 Oct 2009 15:34:21 -0000 1.7
@@ -4,3 +4,4 @@ ruby-1_8_6_287-7_fc11:HEAD:ruby-1.8.6.28
ruby-1_8_6_368-1_fc11:F-11:ruby-1.8.6.368-1.fc11.src.rpm:1243759224
ruby-1_8_6_368-2_fc11:F-11:ruby-1.8.6.368-2.fc11.src.rpm:1245520335
ruby-1_8_6_369-1_fc11:F-11:ruby-1.8.6.369-1.fc11.src.rpm:1245760801
+ruby-1_8_6_383-1_fc11:F-11:ruby-1.8.6.383-1.fc11.src.rpm:1256225647
Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- ruby.spec 14 Oct 2009 15:37:17 -0000 1.138
+++ ruby.spec 22 Oct 2009 15:34:22 -0000 1.139
@@ -1,6 +1,6 @@
%define rubyxver 1.8
%define rubyver 1.8.6
-%define _patchlevel 369
+%define _patchlevel 383
%define dotpatchlevel %{?_patchlevel:.%{_patchlevel}}
%define patchlevel %{?_patchlevel:-p%{_patchlevel}}
%define arcver %{rubyver}%{?patchlevel}
@@ -16,7 +16,7 @@
Name: ruby
Version: %{rubyver}%{?dotpatchlevel}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: Ruby or GPLv2
URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@ Source4: irb.1
Source10: ruby-mode-init.el
Patch1: ruby-deadcode.patch
-Patch20: ruby-rubyprefix.patch
+Patch20: ruby-1.8.6-p383-rubyprefix.patch
Patch21: ruby-deprecated-sitelib-search-path.patch
Patch22: ruby-deprecated-search-path.patch
Patch23: ruby-multilib.patch
@@ -44,7 +44,6 @@ Patch26: ruby-1.8.6-rexml-CVE-200
Patch27: ruby-1.8.6-p287-CVE-2008-5189.patch
Patch28: ruby-1.8.6-p287-remove-ssl-rand-range.patch
Patch29: ruby-always-use-i386.patch
-Patch31: ruby-1.8.6-p369-ri-gem_multipath.patch
Summary: An interpreter of object-oriented scripting language
Group: Development/Languages
@@ -174,7 +173,6 @@ pushd %{name}-%{arcver}
%patch27 -p0
%patch28 -p1
%patch29 -p1
-%patch31 -p1
popd
%build
@@ -537,13 +535,6 @@ rm -rf $RPM_BUILD_ROOT
%{_emacs_sitestartdir}/ruby-mode-init.el
%changelog
-* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
-- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
-
-* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
-- Fix the search path of ri command for ri manuals installed with gem
- (bug 528787)
-
* Sat Jun 20 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.369-1
- New patchlevel fixing CVE-2009-1904
- Fix directory on ARM (#506233, Kedar Sovani)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources 23 Jun 2009 12:40:23 -0000 1.31
+++ sources 22 Oct 2009 15:34:22 -0000 1.32
@@ -1,4 +1,4 @@
b6dd396f513efeb7864685c840f9643a ruby-refm-rdp-1.8.2-ja-html.tar.gz
634c25b14e19925d10af3720d72e8741 rubyfaq-990927.tar.gz
4fcec898f51d8371cc42d0a013940469 rubyfaq-jp-990927.tar.gz
-c3c1f3dd0dfbd2e17a04e59c2f12cfc8 ruby-1.8.6-p369.tar.bz2
+a48703cd982b9f0e3002700a50b0e88e ruby-1.8.6-p383.tar.bz2
--- ruby-1.8.6-p369-ri-gem_multipath.patch DELETED ---
--- ruby-rubyprefix.patch DELETED ---
More information about the scm-commits
mailing list