Merge branch 'master' into f17

xchat-ruby.spec

@@ -1,6 +1,6 @@
 Name: xchat-ruby
 Version: 1.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: An X-Chat plugin providing scripting functionality with Ruby
 
 Group: Applications/Internet
@@ -13,9 +13,9 @@ Patch0: xchat-ruby-global-rubyenv.patch
 Patch1: xchat-ruby-dont-ignore-cflags.patch
 Patch2: xchat-ruby-1.2-fix-null-ptr-deref.diff
 
-BuildRequires: ruby(abi) = 1.8
+BuildRequires: ruby(abi) = 1.9.1
 BuildRequires: ruby-devel ruby
-Requires: ruby(abi) = 1.8
+Requires: ruby(abi) = 1.9.1
 Requires: xchat
 
 %description
@@ -35,29 +35,17 @@ language in which to write X-Chat plugins.
 
 %build
 cd src
-CFLAGS="%{optflags}" make %{?_smp_mflags}
+CFLAGS="%{optflags} -I`ruby -e 'puts File.join(RbConfig::CONFIG[%q(includedir)], RbConfig::CONFIG[%q(sitearch)])'`" make %{?_smp_mflags}
 
 
 %install
-# Get arch-specific load paths
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
-%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
-
 rm -rf %{buildroot}
 mkdir %{buildroot}
 cd src
 # xchat-ruby's make install is broken
 install -D xchat-ruby.so %{buildroot}%{_libdir}/xchat/plugins/xchat-ruby.so
 mkdir -p %{buildroot}%{_sysconfdir}
-cat <<EOS >%{buildroot}%{_sysconfdir}/xchat-rubyenv
-/usr/lib/ruby/site_ruby/1.8
-%{ruby_sitearch}
-/usr/lib/ruby/site_ruby
-/usr/lib/ruby/1.8
-%{ruby_arch}
-.
-EOS
-
+ruby -e 'puts $:.push(".").join("\n")' > %{buildroot}%{_sysconfdir}/xchat-rubyenv
 
 %clean
 rm -rf %{buildroot}
@@ -71,6 +59,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2-12
+- Rebuilt for Ruby 1.9.3.
+
 * Fri Feb 3 2012 Conrad Meyer <konrad@tylerc.org> - 1.2-11
 - Fix null pointer dereference (#787298 reported by Pallai Roland)