From 5c118235d8bdeb362700da137178bbe667d2d1b2 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Dec 15 2011 13:50:21 +0000 Subject: Migrated to RSpec 2.x. --- diff --git a/rubygem-scruffy.spec b/rubygem-scruffy.spec index 60c5b3e..e7b154c 100644 --- a/rubygem-scruffy.spec +++ b/rubygem-scruffy.spec @@ -1,27 +1,27 @@ # Generated from scruffy-0.2.6.gem by gem2rpm -*- rpm-spec -*- -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%define gemname scruffy -%define geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gemname scruffy + +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A powerful, clean graphing library for Ruby Name: rubygem-%{gemname} Version: 0.2.6 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages License: MIT URL: http://scruffy.rubyforge.org Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rubygems +Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(builder) >= 2.0 -BuildRequires: rubygems -BuildRequires: rubygem(rake) -BuildRequires: rubygem(rspec) -BuildRequires: rubygem(newgem) -BuildRequires: rubygem(hoe) >= 2.3.3 +BuildRequires: ruby(rubygems) +BuildRequires: rubygem(builder) +# Use rspec-core until rspec are not migrated to RSpec 2.x +BuildRequires: rubygem(rspec-core) BuildRequires: ruby-RMagick BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} @@ -63,8 +63,12 @@ rm -rf %{buildroot} %check pushd .%{geminstdir} -rake test -rake spec +testrb -Ilib test/*_test.rb + +# RSpec 2.x doesn't support "context" keyword anymore. +sed -i 's/^context "/describe "/' spec/scruffy/layers/base_spec.rb +rspec spec +popd %files %defattr(-, root, root, -) @@ -94,6 +98,9 @@ rake spec %doc %{gemdir}/doc/%{gemname}-%{version} %changelog +* Thu Dec 15 2011 Vít Ondruch - 0.2.6-5 +- Migrated to RSpec 2.x. + * Mon Aug 08 2011 Mo Morsi - 0.2.6-4 - Replace BR(check) with BR