rpms/ruby/devel ruby-rubyprefix.patch, NONE, 1.1 ruby-multilib.patch, 1.2, 1.3 ruby.spec, 1.56, 1.57

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 20 01:08:29 UTC 2006


Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9648

Modified Files:
	ruby-multilib.patch ruby.spec 
Added Files:
	ruby-rubyprefix.patch 
Log Message:
* Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
  and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.
  so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to
  /usr/lib/ruby now. (#184199)

ruby-rubyprefix.patch:
 configure.in |   27 ++++++++++++++++++++++-----
 mkconfig.rb  |    8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

--- NEW FILE ruby-rubyprefix.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2006-04-19 21:54:44.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-04-19 21:59:48.000000000 +0900
@@ -1433,6 +1433,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"
@@ -1441,21 +1448,30 @@
     RUBY_LIB_PREFIX="${prefix}/lib/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='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR="`eval \"echo ${sitedir}\"`"
+SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
+_fc_sitedir=${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}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
@@ -1464,6 +1480,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
@@ -1472,7 +1489,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}")
@@ -1487,8 +1504,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],
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2005-11-11 08:22:03.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-04-19 21:55:08.000000000 +0900
@@ -108,10 +108,10 @@
 print v_fast, v_others
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
+  CONFIG["sitelibdir"] = "$(prefix)/lib/ruby/site_ruby/$(ruby_version)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}

ruby-multilib.patch:
 mkconfig.rb |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ruby-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-multilib.patch	26 Sep 2005 08:58:25 -0000	1.2
+++ ruby-multilib.patch	20 Apr 2006 01:08:22 -0000	1.3
@@ -10,25 +10,3 @@
  print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
  print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
  print "  CONFIG = {}\n"
-diff -ruN ruby-1.8.3.orig/configure.in ruby-1.8.3/configure.in
---- ruby-1.8.3.orig/configure.in	2005-09-07 08:22:56.000000000 +0900
-+++ ruby-1.8.3/configure.in	2005-09-26 17:46:53.000000000 +0900
-@@ -1424,15 +1424,15 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
-   *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
- esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
- 
- AC_ARG_WITH(sitedir,
--	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
-+	    [  --with-sitedir=DIR      site libraries in DIR [LIBDIR/ruby/site_ruby]],
-             [sitedir=$withval],
--            [sitedir='${prefix}/lib/ruby/site_ruby'])
-+            [sitedir='${libdir}/ruby/site_ruby'])
- SITE_DIR="`eval \"echo ${sitedir}\"`"
- case "$target_os" in
-   cygwin*|mingw*|*djgpp*|os2-emx*)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ruby.spec	17 Apr 2006 05:12:03 -0000	1.56
+++ ruby.spec	20 Apr 2006 01:08:23 -0000	1.57
@@ -1,10 +1,11 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
 %define	sitedir		%{_libdir}/ruby/site_ruby
+%define	sitedir2	%{_prefix}/lib/ruby/site_ruby
 
 Name:		ruby
 Version:	1.8.4
-Release:	4.fc6
+Release:	4.fc6.1
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -21,10 +22,11 @@
 Source5:	irb.1
 Source10:	ruby-mode-init.el
 
-Patch1:		ruby-multilib.patch
-Patch3:		ruby-1.8.2-deadcode.patch
-Patch4:		ruby-tcltk-multilib.patch
-Patch5:		ruby-1.8.4-no-eaccess.patch
+Patch1:		ruby-1.8.2-deadcode.patch
+Patch2:		ruby-1.8.4-no-eaccess.patch
+Patch3:		ruby-rubyprefix.patch
+Patch4:		ruby-multilib.patch
+Patch5:		ruby-tcltk-multilib.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -131,14 +133,13 @@
 tar fxz %{SOURCE2}
 popd
 pushd %{name}-%{version}
-%ifarch ppc64 s390x sparc64 x86_64
 %patch1 -p1
-%endif
+%patch2 -p1
 %patch3 -p1
 %ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
-%endif
 %patch5 -p1
+%endif
 popd
 
 %build
@@ -161,7 +162,8 @@
   --enable-shared \
   --enable-ipv6 \
   --with-lookup-order-hack=INET \
-  --disable-rpath
+  --disable-rpath \
+  --with-ruby-prefix=%{_prefix}/lib
 
 make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
 %ifarch ia64
@@ -267,13 +269,21 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
-# generate ri doc
 _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
+%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
+
+%ifarch ppc64 s390x sparc64 x86_64
+# move the arch-specific files to proper location
+mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/
+rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}
+%endif
+
+# generate ri doc
 DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
 
 # XXX: installing irb
-chmod 555 $RPM_BUILD_ROOT%{_bindir}/irb
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 # installing ruby-mode
 cd %{name}-%{version}
@@ -323,8 +333,8 @@
 
 # for ruby-libs
 cp /dev/null ruby-libs.files
-(fgrep    '%{_libdir}' ruby-all.files; 
- fgrep -h '%{_libdir}' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
+(fgrep    '%{_prefix}/lib' ruby-all.files; 
+ fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
  sort | uniq -u > ruby-libs.files
 
 # for ruby-mode
@@ -343,7 +353,6 @@
 cat <<__EOF__ >> ruby-libs.files
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch
 %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest
-%%dir %%{sitedir}/%%{rubyxver}/$arch
 __EOF__
 
 %clean
@@ -381,13 +390,17 @@
 %doc %{name}-%{version}/ChangeLog
 %doc %{name}-%{version}/LEGAL
 %dir %{_libdir}/ruby
+%dir %{_prefix}/lib/ruby
 %dir %{_libdir}/ruby/%{rubyxver}
-%dir %{_libdir}/ruby/%{rubyxver}/cgi
-%dir %{_libdir}/ruby/%{rubyxver}/net
-%dir %{_libdir}/ruby/%{rubyxver}/shell
-%dir %{_libdir}/ruby/%{rubyxver}/uri
+%dir %{_prefix}/lib/ruby/%{rubyxver}
+%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi
+%dir %{_prefix}/lib/ruby/%{rubyxver}/net
+%dir %{_prefix}/lib/ruby/%{rubyxver}/shell
+%dir %{_prefix}/lib/ruby/%{rubyxver}/uri
 %dir %{sitedir}
 %dir %{sitedir}/%{rubyxver}
+%dir %{sitedir2}
+%dir %{sitedir2}/%{rubyxver}
 
 %files tcltk -f ruby-tcltk.files
 %defattr(-, root, root)
@@ -401,9 +414,9 @@
 %files irb -f irb.files
 %defattr(-, root, root)
 %doc tmp-ruby-docs/irb/*
-%dir %{_libdir}/ruby/%{rubyxver}/irb
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc
-%dir %{_libdir}/ruby/%{rubyxver}/irb/lc/ja
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc
+%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja
 
 %files ri -f ri.files
 %defattr(-, root, root)
@@ -420,6 +433,12 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Wed Apr 19 2006 Akira TAGOH <tagoh at redhat.com>
+- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby
+  and keep arch-dependent modules  in /usr/lib64/ruby for 64bit arch.
+  so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to
+  /usr/lib/ruby now. (#184199)
+
 * Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-4
 - correct sitelibdir. (#184198)
 




More information about the fedora-cvs-commits mailing list