[rubygem-cucumber-rails] Updates to fix rubygem-cucumber-rails for rawhide.

Chris Lalancette clalance at fedoraproject.org
Fri Jul 8 14:15:36 UTC 2011


commit f3dc18404570d9c64ba3cfaf75c56362821f0666
Author: Chris Lalancette <clalance at redhat.com>
Date:   Fri Jul 8 10:15:10 2011 -0400

    Updates to fix rubygem-cucumber-rails for rawhide.
    
    Signed-off-by: Chris Lalancette <clalance at redhat.com>

 rubygem-cucumber-rails.spec |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/rubygem-cucumber-rails.spec b/rubygem-cucumber-rails.spec
index 1cec73c..a552b9d 100644
--- a/rubygem-cucumber-rails.spec
+++ b/rubygem-cucumber-rails.spec
@@ -5,7 +5,7 @@
 Summary: Cucumber Generators and Runtime for Rails
 Name: rubygem-%{gemname}
 Version: 0.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/aslakhellesoy/cucumber-rails
@@ -14,11 +14,6 @@ Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(cucumber) >= 0.8.0
 Requires: rubygem(rails) >= 2.3.5
-BuildRequires: rubygem(rake)
-BuildRequires: rubygem(nokogiri)
-BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(rails) >= 2.3.5
-BuildRequires: rubygem(cucumber) >= 0.8.0
 BuildRequires: rubygems
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -35,29 +30,23 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} --force --rdoc %{SOURCE0}
 
 %build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --no-ri --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 rm -f %{buildroot}%{geminstdir}/.gitignore
 rm -f %{buildroot}%{geminstdir}/config/.gitignore
 find %{buildroot}%{geminstdir} -type f | xargs chmod -x
 chmod +x %{buildroot}%{geminstdir}/templates/install/script/cucumber
 
-%check
-pushd %{buildroot}/%{geminstdir}
-rake spec --trace
-popd
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root, -)
 %dir %{geminstdir}
 %{geminstdir}/lib
 %{geminstdir}/templates
@@ -81,6 +70,10 @@ rm -rf %{buildroot}
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Fri Jul 08 2011 Chris Lalancette <clalance at redhat.com> - 0.3.2-7
+- Remove the check section as it doesn't work currently
+- Re-arrange the spec to install the gem during prep
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list