Update to upstream release 1.1.0gitorious

- RHEL 6 compatibility

3 files changed, 28 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index ecd7a34..5a3602a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 daemons-1.0.10.gem
+/daemons-1.1.0.gem
diff --git a/rubygem-daemons.spec b/rubygem-daemons.spec
index 51964d3..77dea88 100644
--- a/rubygem-daemons.spec
+++ b/rubygem-daemons.spec
@@ -1,22 +1,41 @@
 # Generated from daemons-1.0.10.gem by gem2rpm -*- rpm-spec -*-
 %define gem_name daemons
+%if 0%{?el6}
+%global rubyabi 1.8
+%else
+%global rubyabi 1.9.1
+%endif
 
 Summary: A toolkit to create and control daemons in different ways
 Name: rubygem-%{gem_name}
-Version: 1.0.10
-Release: 6%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 Group: Development/Languages
 # The entire source code is MIT except daemonize.rb (GPLv2+ or Ruby)
 License: MIT and (GPLv2+ or Ruby)
 URL: http://daemons.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
-Requires: ruby(abi) = 1.9.1
+BuildRequires: ruby(abi) = %{rubyabi}
+%if 0%{?el6}
+BuildRequires: ruby(rubygems)
+%else
 BuildRequires: rubygems-devel
+%endif
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
+# macros for RHEL6 compatibility:
+%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
+%{!?gem_instdir: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}}
+%{!?gem_libdir: %global gem_libdir %{gem_instdir}/lib}
+%{!?gem_cache: %global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem}
+%{!?gem_spec: %global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec}
+%{!?gem_docdir: %global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}}
+%{!?gem_extdir: %global gem_extdir %{_libdir}/gems/exts/%{gem_name}-%{version}}
+
 %description
 Daemons provides an easy way to wrap existing ruby scripts (for example a
 self-written server)  to be run as a daemon and to be controlled by simple
@@ -57,6 +76,10 @@ chmod a+x %{buildroot}%{gem_instdir}/examples/run/myserver.rb
 %{gem_spec}
 
 %changelog
+* Tue Feb 05 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.1.0-1
+- Update to upstream release 1.1.0
+- RHEL 6 compatibility
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 3e077b1..4a2939d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e2fc7de08405b2d27ac96c82602c9ce  daemons-1.0.10.gem
+6c50720bab6a19d88b401a98a79c49ce  daemons-1.1.0.gem