[rubygem-net-ping] version bump and importing msuchy's fixes

lzap lzap at fedoraproject.org
Mon Nov 26 13:54:20 UTC 2012


commit c00de591a2d039a01e1f360577018e85d8f5612f
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Mon Nov 26 14:54:14 2012 +0100

    version bump and importing msuchy's fixes

 rubygem-net-ping.spec |   51 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/rubygem-net-ping.spec b/rubygem-net-ping.spec
index 6a8fd1d..676cee0 100644
--- a/rubygem-net-ping.spec
+++ b/rubygem-net-ping.spec
@@ -1,29 +1,40 @@
 %global gem_name net-ping
+%if 0%{?rhel} == 6
+%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
+%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
+%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
+%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
+%endif
 
 Summary: A ping interface for Ruby
 Name: rubygem-%{gem_name}
 Version: 1.5.3
-Release: 2%{?dist}
+Release: 6%{?dist}
 Group: Development/Languages
 License: Artistic 2.0
 URL: http://www.rubyforge.org/projects/shards
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
-# for rhel5 compatibility
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch: noarch
-
 Provides: rubygem(%{gem_name}) = %{version}
-
+%if 0%{?rhel} == 6 || 0%{?fedora} < 17
+Requires: ruby(abi) = 1.8
+%else
 Requires: ruby(abi) = 1.9.1
+%endif
 Requires: ruby(rubygems)
-
+BuildRequires: rubygems
 BuildRequires: ruby
+%if 0%{?fedora}
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(test-unit)
 BuildRequires: rubygem(fakeweb)
 BuildRequires: iputils
+%endif
+Requires: rubygem(net-ldap) >= 0.2.2
+Requires: rubygem(net-ldap) < 0.3
+Requires: rubygem(ffi) >= 1.0.0
 
 %description
 The net-ping library provides a ping interface for Ruby. It includes
@@ -49,7 +60,9 @@ mkdir -p %{buildroot}%{gem_dir}
 gem install --local --install-dir %{buildroot}%{gem_dir} --force %{SOURCE0}
 
 
+
 %check
+%if 0%{?fedora}
 pushd %{buildroot}%{gem_instdir}
 # three tests are ignored because of missing network connectivity
 RUBYOPT="-Ilib" testrb2 test/test_net_ping.rb \
@@ -57,16 +70,11 @@ RUBYOPT="-Ilib" testrb2 test/test_net_ping.rb \
 --ignore-name=test_pinging_a_good_host_results_in_no_exception_data \
 --ignore-name=test_pinging_a_good_host_returns_true
 popd
-
-
-# for rhel5 compatibility
-%clean
-rm -rf %{buildroot}
-
+%endif
 
 %files
-%defattr(-, root, root, -)
-%{gem_libdir}
+%dir %{gem_instdir}
+%{gem_instdir}/lib
 %doc %{gem_instdir}/README
 %{gem_cache}
 %{gem_spec}
@@ -86,6 +94,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 26 2012 Miroslav Suchý <msuchy at redhat.com> 1.5.3-6
+- require net-ldap and ffi (msuchy at redhat.com)
+
+* Fri Aug 10 2012 Miroslav Suchý <msuchy at redhat.com> 1.5.3-5
+- fix filelist section (msuchy at redhat.com)
+
+* Fri Aug 10 2012 Miroslav Suchý <msuchy at redhat.com> 1.5.3-4
+- add rubygems to buildrequires (msuchy at redhat.com)
+
+* Thu Aug 09 2012 Miroslav Suchý <msuchy at redhat.com> 1.5.3-3
+- new package built with tito
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -107,4 +127,3 @@ rm -rf %{buildroot}
 
 * Tue Jan 25 2011 Lukas Zapletal <lzap+rpm[@]redhat.com> - 1.4.0-1
 - Initial package
-


More information about the scm-commits mailing list