[rubygem-compass/f16] update to compass 0.11.5

Mohammed Morsi mmorsi at fedoraproject.org
Wed Sep 28 16:42:42 UTC 2011


commit 8af1c838137d89230df1779dbb0589658a2f815b
Author: Mo Morsi <mmorsi at redhat.com>
Date:   Wed Sep 28 12:41:53 2011 -0400

    update to compass 0.11.5

 .gitignore                      |    1 +
 compass-0.11.5-test-fixes.patch |   52 +++++++++++++++++++++++++++++++++++++++
 rubygem-compass.spec            |   33 ++++++++++++++++++------
 sources                         |    2 +-
 4 files changed, 78 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc98a0d..758781f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 compass-0.8.17.gem
 /compass-0.10.6.gem
+/compass-0.11.5.gem
diff --git a/compass-0.11.5-test-fixes.patch b/compass-0.11.5-test-fixes.patch
new file mode 100644
index 0000000..6539ac0
--- /dev/null
+++ b/compass-0.11.5-test-fixes.patch
@@ -0,0 +1,52 @@
+diff -sup compass-0.11.5/Rakefile compass-0.11.5.new/Rakefile
+--- Rakefile	2011-09-28 11:42:52.000000000 -0400
++++ Rakefile	2011-09-28 09:30:57.000000000 -0400
+@@ -1,6 +1,6 @@
+ require 'rubygems'
+-require 'bundler'
+-Bundler.setup
++
++$: << "lib"
+ require 'compass'
+ 
+ # ----- Default: Testing ------
+diff -sup compass-0.11.5/test/integrations/compass_test.rb compass-0.11.5.new/test/integrations/compass_test.rb
+--- test/integrations/compass_test.rb	2011-09-28 11:42:52.000000000 -0400
++++ test/integrations/compass_test.rb	2011-09-28 11:49:30.000000000 -0400
+@@ -62,17 +62,6 @@ class CompassTest < Test::Unit::TestCase
+     end
+   end
+ 
+-  def test_compass
+-    within_project('compass') do |proj|
+-      each_css_file(proj.css_path) do |css_file|
+-        assert_no_errors css_file, 'compass'
+-      end
+-      each_sass_file do |sass_file|
+-        assert_renders_correctly sass_file, :ignore_charset => true
+-      end
+-    end
+-  end
+-
+   def test_busted_image_urls
+     within_project('busted_image_urls') do |proj|
+       each_css_file(proj.css_path) do |css_file|
+diff -sup compass-0.11.5/test/units/sprites/sprite_command_test.rb compass-0.11.5.new/test/units/sprites/sprite_command_test.rb
+--- test/units/sprites/sprite_command_test.rb	2011-09-28 11:42:52.000000000 -0400
++++ test/units/sprites/sprite_command_test.rb	2011-09-28 11:09:08.000000000 -0400
+@@ -37,7 +37,7 @@ class SpriteCommandTest < Test::Unit::Te
+   def run_compass_with_options(options)
+     output = 'foo'
+     ::Dir.chdir @test_dir
+-    %x{compass #{options.join(' ')}}
++    %x{../../../../bin/compass #{options.join(' ')}}
+   end
+ 
+   def options_to_cli(options)
+@@ -57,4 +57,4 @@ class SpriteCommandTest < Test::Unit::Te
+     assert File.exists?(File.join(test_dir, 'stylesheet.scss'))
+   end
+ 
+-end
+\ No newline at end of file
++end
diff --git a/rubygem-compass.spec b/rubygem-compass.spec
index aa65fe3..9b5ece9 100644
--- a/rubygem-compass.spec
+++ b/rubygem-compass.spec
@@ -8,21 +8,26 @@
 
 Name: rubygem-%{gemname}
 Summary: A Sass-based CSS Meta-Framework
-Version: 0.10.6
+Version: 0.11.5
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://compass-style.org
 
 Source0: http://gemcutter.org/downloads/compass-%{version}.gem
+Patch1: compass-0.11.5-test-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: rubygems
 BuildRequires: rubygem(rake)
-BuildRequires: rubygem(haml) >= 2.2.0
+BuildRequires: rubygem(cucumber)
+BuildRequires: rubygem(mocha)
+BuildRequires: rubygem(chunky_png)
+BuildRequires: rubygem(timecop)
+BuildRequires: rubygem(haml) >= 3.1
 Requires: ruby(abi) = %{rubyabi} 
 Requires: rubygems
-Requires: rubygem(haml) >= 3.0.4
+Requires: rubygem(haml) >= 3.1
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -32,17 +37,22 @@ any of the following CSS frameworks: Compass Core, Blueprint,
 960, Susy, YUI, and others.
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} --bindir .%{_bindir} \
+            --force %{SOURCE0}
+pushd .%{geminstdir}
+%patch1
 
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force %{SOURCE0} --no-ri
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+
 mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gemdir}/bin
+cp -a .%{_bindir}/* %{buildroot}%{_bindir}/
+
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
 # rpmlint will complain about these files
@@ -50,9 +60,10 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
 %check
 pushd %{buildroot}/%{geminstdir}
-rake run_tests
+rake test
 # rpmlint will complain about these files
 rm -rf test/fixtures/stylesheets/*/sass/.sass-cache
+rm -rf .sass-cache
 popd
 
 %clean
@@ -72,12 +83,16 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/examples
 %doc %{geminstdir}/test
 %doc %{geminstdir}/features
+%doc %{geminstdir}/.yardoc
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Wed Sep 28 2011 Mo Morsi <mmorsi at redhat.com> - 0.11.5-1
+- update to latest upstream release
+
 * Tue Mar 29 2011 Mo Morsi <mmorsi at redhat.com> - 0.10.6-1
 - update to latest upstream release
 
diff --git a/sources b/sources
index 86b06ec..b4c9228 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4dcb895aefd5c8d1fb69a927c315e13  compass-0.10.6.gem
+7991fd71d6c3b0968f636de4f051ac0a  compass-0.11.5.gem


More information about the scm-commits mailing list