[ruby-spqr/f17] updated to 0.3.6-2; Ruby 1.9.3 compatibility and other fixes.

[William Christian Benton]

commit 3a75367f97187e85ad6a780e254f4206ab527208
Author: Will Benton <willb at redhat.com>
Date:   Fri Feb 10 11:05:43 2012 -0600

    updated to 0.3.6-2; Ruby 1.9.3 compatibility and other fixes.

 .gitignore     |    1 +
 ruby-spqr.spec |   46 +++++++++++++++++++++++++++++++---------------
 sources        |    2 +-
 3 files changed, 33 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16beda8..651967a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ruby-spqr-0.3.5.tar.gz
+/ruby-spqr-0.3.6.tar.gz
diff --git a/ruby-spqr.spec b/ruby-spqr.spec
index 4d86d62..cdf59a0 100644
--- a/ruby-spqr.spec
+++ b/ruby-spqr.spec
@@ -1,23 +1,33 @@
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+
 %if (0%{?fedora} == 0 && 0%{?rhel} <= 5)
 %global building_for_el5 1
 %else
 %global building_for_el5 0
 %endif
 
+%if (0%{?fedora} >= 17)
+%global ruby_abi 1.9.1
+%global ruby_appropriate_install_dir %{ruby_vendorlibdir}
+%else
+%global ruby_abi 1.8
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%global ruby_appropriate_install_dir %{ruby_sitelib}
+%endif
+
 Summary: SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in Ruby
 Name: ruby-spqr
-Version: 0.3.5
-Release: 3%{?dist}
+Version: 0.3.6
+Release: 2%{?dist}
 Group: Applications/System
 License: ASL 2.0
 URL: http://git.fedorahosted.org/git/grid/spqr.git
 Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: ruby(abi) = 1.9.1
+Requires: ruby(abi) = %{?ruby_abi}
 Requires: ruby
 Requires: ruby-qmf
 BuildRequires: ruby
-BuildRequires: ruby-devel
 BuildArch: noarch
 
 %description
@@ -27,7 +37,7 @@ SPQR makes it very simple to expose methods on Ruby objects over QMF.
 Summary: Generates an spqr app from an xml schema
 Group: Applications/System
 Requires: ruby-spqr
-Requires: ruby(abi) = 1.9.1
+Requires: ruby(abi) = %{?ruby_abi}
 Requires: ruby
 
 %description -n spqr-gen
@@ -44,14 +54,14 @@ QMF schema file.
 rm -rf %{buildroot}
 %endif
 mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/app.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/codegen.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/constants.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/event.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/manageable.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/spqr.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
-cp -p -f lib/spqr/utils.rb %{buildroot}/%{ruby_vendorlibdir}/spqr
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/app.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/codegen.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/constants.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/event.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/manageable.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/spqr.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
+cp -p -f lib/spqr/utils.rb %{buildroot}/%{ruby_appropriate_install_dir}/spqr
 cp -p -f bin/spqr-gen.rb %{buildroot}/%{_bindir}
 
 %if %{building_for_el5}
@@ -65,7 +75,7 @@ rm -rf %{buildroot}
 %endif
 %doc LICENSE README.rdoc CHANGES TODO VERSION
 %doc examples
-%{ruby_vendorlibdir}/spqr/
+%{ruby_appropriate_install_dir}/spqr/
 
 %files -n spqr-gen
 %if %{building_for_el5}
@@ -76,13 +86,19 @@ rm -rf %{buildroot}
 %{_bindir}/spqr-gen.rb
 
 %changelog
+
+* Fri Feb 10 2012 willb <willb at redhat> - 0.3.6-2
+- Packaging fixes for F17.
+
+* Thu Feb 9 2012 <willb at redhat> - 0.3.6-1
+- Fixes for compatibility with Ruby 1.9
+
 * Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.3.5-3
 - Rebuilt for Ruby 1.9.3.
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-
 * Wed Nov 23 2011 <willb at redhat> - 0.3.5-1
 - bug fix with explicit authentication mechanisms (BZ 756401)
 - added additional explicit authentication mechanisms (BZ 756402)
diff --git a/sources b/sources
index 38d4324..482156b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96d0aab5a9dc46dd6f5655d2f084e40c  ruby-spqr-0.3.5.tar.gz
+0941ebca5b225e09de2cc5e736ece5ec  ruby-spqr-0.3.6.tar.gz