[xmms2] Rebuilt for Ruby 1.9.3.

[Vít Ondruch]

commit e95cdb6ad2eb9e4e2be2377b45ed1e418fda848a
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 8 09:28:11 2012 +0100

    Rebuilt for Ruby 1.9.3.

 xmms2-0.5DrLecter-moresaneversioning.patch         |   36 ----------
 xmms2-0.5DrLecter-no-O0.patch                      |   14 ----
 xmms2-0.5DrLecter-pulse-output-default.patch       |    9 ---
 xmms2-0.5DrLecter-use-libdir.patch                 |   25 -------
 ...2-0.6DrMattDestruction-moresaneversioning.patch |   36 ----------
 ...0.6DrMattDestruction-pulse-output-default.patch |    9 ---
 xmms2-0.6DrMattDestruction-use-libdir.patch        |   68 --------------------
 xmms2-0.7DrNo-moresaneversioning.patch             |   36 ----------
 xmms2-0.7DrNo-no-O0.patch                          |   21 ------
 xmms2-0.7DrNo-use-libdir.patch                     |   63 ------------------
 ...-054a12d54325820c8d31e482193007af0ed15be3.patch |   23 -------
 ...-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch |   23 -------
 xmms2.spec                                         |   22 ++++--
 13 files changed, 15 insertions(+), 370 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index b45f4ee..1f7d927 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -1,12 +1,11 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 %global codename DrO_o
 
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.8
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -87,7 +86,7 @@ Perl bindings for XMMS2.
 Summary:	Ruby support for XMMS2
 Group:		Applications/Multimedia
 Requires:	%{name} = %{version}-%{release}
-Requires:	ruby(abi) = 1.8
+Requires:	ruby(abi) = 1.9.1
 
 %description ruby
 Ruby bindings for XMMS2.
@@ -124,7 +123,8 @@ export CFLAGS="%{optflags}"
 export CPPFLAGS="%{optflags}"
 export LIBDIR="%{_libdir}"
 export PYTHONDIR="%{python_sitearch}"
-./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1
+./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \
+  --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1
 ./waf build -v %{?_smp_mflags}
 # make the docs
 doxygen
@@ -133,11 +133,12 @@ doxygen
 rm -rf %{buildroot}
 export LIBDIR="%{_libdir}"
 export python_LIBDEST="%{python_sitearch}"
-./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
+./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \
+  --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 
 # exec flags for debuginfo
 chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \
-	%{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_sitearch}/xmmsclient_*.so
+	%{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_vendorarchdir}/xmmsclient_*.so
 
 # Convert to utf-8
 for i in %{buildroot}%{_mandir}/man1/*.gz; do
@@ -188,13 +189,20 @@ rm -rf %{buildroot}
 
 %files ruby
 %defattr(-,root,root,-)
-%{ruby_sitearch}/xmmsclient*
+%{ruby_vendorlibdir}/xmmsclient.rb
+%{ruby_vendorlibdir}/xmmsclient/
+%{ruby_vendorarchdir}/xmmsclient_ecore.so
+%{ruby_vendorarchdir}/xmmsclient_ext.so
+%{ruby_vendorarchdir}/xmmsclient_glib.so
 
 %files -n nyxmms2
 %defattr(-,root,root,-)
 %{_bindir}/nyxmms2
 
 %changelog
+* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.8-3
+- Rebuilt for Ruby 1.9.3.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild