[eruby/f17] fix build with ruby 1.9

[Tom Callaway]

commit de4c663a129c486b9e692958a635301420469353
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Mar 26 12:24:48 2012 -0400

    fix build with ruby 1.9

 eruby.spec |   46 ++++++++++++++++++++--------------------------
 1 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/eruby.spec b/eruby.spec
index 4d88489..f058432 100644
--- a/eruby.spec
+++ b/eruby.spec
@@ -1,6 +1,8 @@
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
-%define ruby_archdir %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
+%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')}
+%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')}
+%define ruby_archdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+
+%global ruby_cflags %(pkg-config --cflags ruby-1.9)
 
 Name:		eruby
 Version:	1.0.5
@@ -9,14 +11,13 @@ Release:	17%{?dist}
 # liberuby is LGPLv2+
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.modruby.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ruby
 BuildRequires:	ruby-devel >= 1.8.0
-
 Source0:	http://www.modruby.net/archive/%{name}-%{version}.tar.gz
-Patch0:		eruby-fix-build.patch
-
-
+# Thanks to FreeBSD.
+Patch0:		patch-aa-git
+Patch1:		eruby-fix-build.patch
+Patch2:		eruby-1.0.5-ruby19.patch
 Summary:	An interpreter of embedded Ruby language
 Group:		Development/Languages
 
@@ -24,17 +25,15 @@ Group:		Development/Languages
 eRuby interprets a Ruby code embedded text file. For example, eRuby
 enables you to embed a Ruby code to a HTML file.
 
-
 %package libs
 Summary:	Library for eRuby
 Group:		Development/Languages
-Requires:	ruby(abi) = 1.8
+Requires:	ruby(abi) >= 1.9.0
 Provides:	ruby(eruby) = %{version}
 
 %description libs
 This package contains a library for eRuby.
 
-
 %package devel
 Summary:	Development files for eRuby
 Group:		Development/Languages
@@ -46,21 +45,21 @@ embedded eRuby.
 
 %prep
 %setup -q
-%patch0 -p1 -b .0-build
+%patch0 -p1 -b .git
+%patch1 -p1 -b .0-build
+%patch2 -p1 -b .ruby19
 
 %build
-ruby configure.rb --enable-shared
+ruby configure.rb --enable-shared CFLAGS="%{optflags} %{ruby_cflags}"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
+mkdir -p $RPM_BUILD_ROOT%{ruby_vendorarchdir}
 
 # installing binaries ...
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -72,39 +71,34 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
 find $RPM_BUILD_ROOT%{_libdir} -name '*.so*' | xargs chmod 0755
 
 # workaround for not working site-install properly
-mv $RPM_BUILD_ROOT%{ruby_archdir}/eruby.so $RPM_BUILD_ROOT%{ruby_sitearch}/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+mv $RPM_BUILD_ROOT%{ruby_archdir}/eruby.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}/
 
 %post -p /sbin/ldconfig libs
 
 %postun -p /sbin/ldconfig libs
 
 %files
-%defattr (-, root, root, -)
 %doc COPYING GPL README.en ChangeLog examples
 %lang(ja) %doc README.ja
 %{_bindir}/eruby
 %{_mandir}/man1/eruby.1*
 
 %files libs
-%defattr (-, root, root, -)
 %doc COPYING LGPL README.en
 %lang(ja) %doc README.ja
 %{_libdir}/liberuby.so.*
-%{ruby_sitearch}/eruby.so
+%{ruby_vendorarchdir}/eruby.so
 
 %files devel
-%defattr (-, root, root, -)
 %doc COPYING LGPL README.en
 %lang(ja) %doc README.ja
 %{_includedir}/eruby.h
 %{_libdir}/liberuby.so
 
-
 %changelog
+* Mon Mar 26 2012 Tom Callaway <spot at fedoraproject.org> - 1.0.5-18
+- rebuild with ruby 1.9 (thanks to FreeBSD)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild