[ruby-rhubarb/f18] imported latest SRPM

William Christian Benton willb at fedoraproject.org
Tue Aug 14 18:51:37 UTC 2012


commit d07884180c4e4c343d3c7224df93fadb684b8421
Author: Will Benton <willb at redhat.com>
Date:   Tue Aug 14 13:50:35 2012 -0500

    imported latest SRPM

 .gitignore        |    1 +
 ruby-rhubarb.spec |   56 +++++++++++++++++++++++++++++++++++++++++-----------
 sources           |    2 +-
 3 files changed, 46 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7092f3d..56946f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ruby-rhubarb-0.4.1.tar.gz
+/ruby-rhubarb-0.4.3.tar.gz
diff --git a/ruby-rhubarb.spec b/ruby-rhubarb.spec
index 8c32aed..23899ee 100644
--- a/ruby-rhubarb.spec
+++ b/ruby-rhubarb.spec
@@ -1,24 +1,41 @@
+%{!?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}
+%global requires_ruby_devel 1
+%global sqlite_pkg rubygem-sqlite3
+%else
+%global ruby_abi 1.8
+%global requires_ruby_devel 0
+%global sqlite_pkg ruby-sqlite3
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%global ruby_appropriate_install_dir %{ruby_sitelib}
+%endif
+
 Summary: Simple versioned object-graph persistence layer
 Name: ruby-rhubarb
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.3
+Release: 5%{?dist}
 Group: Applications/System
 License: ASL 2.0
 URL: http://git.fedorahosted.org/git/grid/rhubarb.git
 Source0: https://fedorahosted.org/releases/g/r/grid/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: ruby-sqlite3
+Requires: %{sqlite_pkg}
 Requires: ruby
-Requires: ruby(abi) = 1.9.1
+Requires: ruby(abi) = %{?ruby_abi}
 Provides: ruby(rhubarb/rhubarb)
 BuildRequires: ruby
+%if %{requires_ruby_devel}
 BuildRequires: ruby-devel
+%endif
 BuildArch: noarch
 
 %description
@@ -36,10 +53,10 @@ and plays nicely with the SPQR object publishing framework.
 %if %{building_for_el5}
 rm -rf %{buildroot}
 %endif
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/rhubarb
-mkdir -p %{buildroot}/%{ruby_vendorlibdir}/rhubarb/mixins
-cp -p -f lib/rhubarb/mixins/*.rb %{buildroot}/%{ruby_vendorlibdir}/rhubarb/mixins
-cp -p -f lib/rhubarb/*.rb %{buildroot}/%{ruby_vendorlibdir}/rhubarb
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/rhubarb
+mkdir -p %{buildroot}/%{ruby_appropriate_install_dir}/rhubarb/mixins
+cp -p -f lib/rhubarb/mixins/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/rhubarb/mixins
+cp -p -f lib/rhubarb/*.rb %{buildroot}/%{ruby_appropriate_install_dir}/rhubarb
 
 %if %{building_for_el5}
 %clean
@@ -51,19 +68,34 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %endif
 %doc LICENSE README.rdoc CHANGES TODO VERSION
-%{ruby_vendorlibdir}/rhubarb/
+%{ruby_appropriate_install_dir}/rhubarb/
 
 %changelog
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Mar 26 2012 willb <willb at redhat> - 0.4.3-5
+- F17 packaging fixes.
+
+* Sun Feb 12 2012 willb <willb at redhat> - 0.4.3-4
+- Changed SQLite dependency to the gem version on F17.
+
+* Fri Feb 10 2012 willb <willb at redhat> - 0.4.3-3
+- Another F17 fix.
+
+* Fri Feb 10 2012 willb <willb at redhat> - 0.4.3-2
+- Packaging fixes for F17.
+
+* Thu Feb 9 2012 willb <willb at redhat> - 0.4.3-1
+- More fixes for running under Ruby 1.9
 
 * Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.4.1-3
 - Rebuilt for Ruby 1.9.3.
 
+* Wed Feb 8 2012 willb <willb at redhat> - 0.4.2-1
+- Fixes for running under Ruby 1.9
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-
 * Tue Oct 11 2011 willb <willb at redhat> - 0.4.1-1
 - Updated to version 0.4.1, which exclusively includes build workflow improvements
 
diff --git a/sources b/sources
index 02b0a38..099b57b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-649fd836bb812760bb3e4b3efcb6cce5  ruby-rhubarb-0.4.1.tar.gz
+987d1e53e3945e296971ed5f069ce8bf  ruby-rhubarb-0.4.3.tar.gz


More information about the scm-commits mailing list