[ruby] Adjust the patch to pass test_archdirs(TestRbConfig).

Vít Ondruch vondruch at fedoraproject.org
Fri Feb 22 14:26:34 UTC 2013


commit 58664af968a5e7482f9fb6aa04e5a6557590c106
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Feb 22 11:52:15 2013 +0100

    Adjust the patch to pass test_archdirs(TestRbConfig).
    
    This is hopefuly better aligned with upstream intentions.

 ruby-1.9.3-arch-specific-dir.patch |    4 ++--
 ruby.spec                          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ruby-1.9.3-arch-specific-dir.patch b/ruby-1.9.3-arch-specific-dir.patch
index e32814b..fcdc2fc 100644
--- a/ruby-1.9.3-arch-specific-dir.patch
+++ b/ruby-1.9.3-arch-specific-dir.patch
@@ -15,8 +15,8 @@ index d6af000..1c094a3 100644
  rubylibdir='${rubylibprefix}/${ruby_version}'
  rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
  
-+AC_ARG_WITH(archdir,
-+     AS_HELP_STRING([--with-archdir=DIR], [architecture specific ruby libraries [[LIBDIR/RUBY_BASE_NAME/ARCH]]]),
++AC_ARG_WITH(rubyarchdir,
++     AS_HELP_STRING([--with-rubyarchdir=DIR], [architecture specific ruby libraries [[LIBDIR/RUBY_BASE_NAME/ARCH]]]),
 +            [rubyarchdir=$withval])
 +
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
diff --git a/ruby.spec b/ruby.spec
index 0bc18d7..d369ac3 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -392,7 +392,7 @@ autoconf
 
 %configure \
         --with-rubylibprefix='%{ruby_libdir}' \
-        --with-archdir='%{ruby_libarchdir}' \
+        --with-rubyarchdir='%{ruby_libarchdir}' \
         --with-sitedir='%{ruby_sitelibdir}' \
         --with-sitearchdir='%{ruby_sitearchdir}' \
         --with-vendordir='%{ruby_vendorlibdir}' \


More information about the scm-commits mailing list