[packages/saslwrapper] - fix config on ruby 2.3 - rel 6

[baggins]

commit ad860c6ebd974117078fe82bee8c2eba99942596
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 26 12:12:30 2017 +0100

    - fix config on ruby 2.3
    - rel 6

 ruby-config.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 saslwrapper.spec  |  4 +++-
 2 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/saslwrapper.spec b/saslwrapper.spec
index 2a2098a..73ccbd5 100644
--- a/saslwrapper.spec
+++ b/saslwrapper.spec
@@ -7,13 +7,14 @@
 Summary:	Ruby and Python wrappers for the Cyrus SASL library
 Name:		saslwrapper
 Version:	0.16
-Release:	5
+Release:	6
 License:	Apache v2.0
 Group:		Libraries
 # svn export -r 1346225 https://svn.apache.org/repos/asf/qpid/tags/0.16/qpid/extras/sasl saslwrapper-0.16
 # tar -cJf saslwrapper-0.16.tar.xz saslwrapper-0.16
 Source0:	http://pkgs.fedoraproject.org/repo/pkgs/saslwrapper/%{name}-%{version}.tar.xz/e801d697a196647938eb1521be414090/saslwrapper-%{version}.tar.xz
 # Source0-md5:	e801d697a196647938eb1521be414090
+Patch0:		ruby-config.patch
 URL:		http://qpid.apache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -74,6 +75,7 @@ Ruby bindings for the saslwrapper library.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal} -I m4
diff --git a/ruby-config.patch b/ruby-config.patch
new file mode 100644
index 0000000..9688a69
--- /dev/null
+++ b/ruby-config.patch
@@ -0,0 +1,44 @@
+--- saslwrapper-0.16/configure.ac~	2011-12-07 21:08:19.000000000 +0100
++++ saslwrapper-0.16/configure.ac	2017-11-26 12:10:02.436698127 +0100
+@@ -168,13 +168,13 @@
+ if test -n "$RUBY" ; then
+    AC_ARG_VAR(RUBY_INC, [Directory where ruby.h can be found])
+    if test -z "$RUBY_INC" ; then
+-      [RUBY_INC=`$RUBY -rrbconfig -e 'puts Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"]'`]
++      [RUBY_INC=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]'`]
+    fi
+    AC_SUBST(RUBY_INC)
+ 
+    AC_ARG_VAR(RUBY_INC_ARCH, [Directory where ruby/config.h can be found (needed from Ruby 1.9)])
+    if test -z "$RUBY_INC_ARCH" ; then
+-      [RUBY_INC_ARCH=`$RUBY -rrbconfig -e 'd = Config::CONFIG["rubyhdrdir"];if d != nil; print d + "/" + Config::CONFIG["arch"]; end'`]
++      [RUBY_INC_ARCH=`$RUBY -rrbconfig -e 'd = RbConfig::CONFIG["rubyhdrdir"];if d != nil; print d + "/" + RbConfig::CONFIG["arch"]; end'`]
+       dnl For earlier versions, just make it the same as RUBY_INC.
+       test x"$RUBY_INC_ARCH" != x || RUBY_INC_ARCH=$RUBY_INC
+    fi
+@@ -182,14 +182,14 @@
+    AC_ARG_VAR(RUBY_LIB, [Directory to install ruby files into])
+       if test -z "$RUBY_LIB" ; then
+       dnl Kludge to install ruby files under $prefix
+-      [RUBY_LIB=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitelibdir"].gsub("/usr", "${prefix}")'`]
++      [RUBY_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"].gsub("/usr", "${prefix}")'`]
+    fi
+    AC_SUBST(RUBY_LIB)
+ 
+ 	AC_ARG_VAR(RUBY_LIB_ARCH, [Directory to install ruby binary modules into])
+ 	if test -z "$RUBY_LIB_ARCH" ; then
+       dnl Kludge to install ruby files under $prefix
+-	  [RUBY_LIB_ARCH=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitearchdir"].gsub("/usr", "${prefix}")'`]
++	  [RUBY_LIB_ARCH=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"].gsub("/usr", "${prefix}")'`]
+ 	fi
+ 	AC_SUBST(RUBY_LIB_ARCH)
+ 
+@@ -199,7 +199,7 @@
+ 	esac
+ 	AC_SUBST(RUBY_LIBS)
+ 
+-   RUBY_DLEXT=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["DLEXT"]]'`
++   RUBY_DLEXT=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["DLEXT"]]'`
+    AC_SUBST(RUBY_DLEXT)
+ fi
+ AM_CONDITIONAL([HAVE_RUBY_DEVEL], [test -f $RUBY_INC/ruby.h && test -n "$SWIG"])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/saslwrapper.git/commitdiff/ad860c6ebd974117078fe82bee8c2eba99942596