[packages/ruby-cucumber] resolve autotest/discover.rb file conflict

[glen]

commit cf21c59aa1f388be55f9f4f44b62817471c6d230
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 5 21:12:00 2013 +0300

    resolve autotest/discover.rb file conflict

 ruby-cucumber.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/ruby-cucumber.spec b/ruby-cucumber.spec
index c2cee70..1a1b17b 100644
--- a/ruby-cucumber.spec
+++ b/ruby-cucumber.spec
@@ -1,3 +1,5 @@
+# TODO
+# - patch rspec to integrate cucumber rules too in autotest/discover.rb
 %define	pkgname	cucumber
 Summary:	Tool to execute plain-text documents as functional tests
 Name:		ruby-%{pkgname}
@@ -37,6 +39,9 @@ cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
 
 %{__rm} $RPM_BUILD_ROOT%{ruby_vendorlibdir}/README.rdoc
 
+# conflicts with ruby-rspec-core-2.13.1
+%{__rm} $RPM_BUILD_ROOT%{ruby_vendorlibdir}/autotest/discover.rb
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,4 +59,3 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_vendorlibdir}/autotest/cucumber_rails_rspec2.rb
 %{ruby_vendorlibdir}/autotest/cucumber_rspec.rb
 %{ruby_vendorlibdir}/autotest/cucumber_rspec2.rb
-%{ruby_vendorlibdir}/autotest/discover.rb
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-cucumber.git/commitdiff/cf21c59aa1f388be55f9f4f44b62817471c6d230