[rubygem-uuidtools] Use RSpec 2.x instead of RSpec 1.x.

Vít Ondruch vondruch at fedoraproject.org
Thu Dec 15 10:23:58 UTC 2011


commit 775b67a2b32981eb914faa9aba2707c827fed4e2
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Dec 15 11:23:53 2011 +0100

    Use RSpec 2.x instead of RSpec 1.x.

 rubygem-uuidtools.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/rubygem-uuidtools.spec b/rubygem-uuidtools.spec
index 1418f40..137c53a 100644
--- a/rubygem-uuidtools.spec
+++ b/rubygem-uuidtools.spec
@@ -1,6 +1,7 @@
 # Generated from uuidtools-2.1.1.gem by gem2rpm -*- rpm-spec -*-
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname uuidtools
+
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 %global rubyabi 1.8
@@ -8,7 +9,7 @@
 Summary: A simple universally unique ID generation library
 Name: rubygem-%{gemname}
 Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://uuidtools.rubyforge.org/
@@ -17,8 +18,8 @@ Requires: ruby(rubygems)
 Requires: ruby(abi) = %{rubyabi}
 BuildRequires: ruby(rubygems)
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygem(rake)
-BuildRequires: rubygem(rspec)
+# Use rspec-core until rspec are not migrated to RSpec 2.x
+BuildRequires: rubygem(rspec-core)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -59,14 +60,15 @@ rm -rf %{buildroot}
 pushd .%{geminstdir}
 # Can't run during check as it calls ifconfig
 echo 'UUIDTools::UUID.mac_address = "00:1f:c6:62:3d:15"' >> spec/spec_helper.rb
-rake spec:normal
+rspec spec
+popd
 
 %files
 %defattr(-,root,root,-)
 %doc %{geminstdir}/[A-Z]*
 %dir %{geminstdir}
 %{geminstdir}/lib
-%{gemdir}/cache/%{gemname}-%{version}.gem
+%exclude %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
@@ -78,6 +80,9 @@ rake spec:normal
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Thu Dec 15 2011 Vít Ondruch <vondruch at redhat.com> - 2.1.1-4
+- Use RSpec 2.x instead of RSpec 1.x.
+
 * Mon Aug 08 2011 Mo Morsi <mmorsi at redhat.com> - 2.1.1-3
 - Initial package
 


More information about the scm-commits mailing list