From 05a6ac0622289608caa7d8a179f623b717aaee87 Mon Sep 17 00:00:00 2001
From: Mo Morsi <mmorsi@redhat.com>
Date: Sep 28 2011 15:59:47 +0000
Subject: update to sass 3.1.7


---

diff --git a/.gitignore b/.gitignore
index 8c63423..f37c077 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sass-3.1.4.gem
+/sass-3.1.7.gem
diff --git a/rubygem-sass.spec b/rubygem-sass.spec
index de7437b..6dfff39 100644
--- a/rubygem-sass.spec
+++ b/rubygem-sass.spec
@@ -7,7 +7,7 @@
 
 Summary: A powerful but elegant CSS compiler that makes CSS fun again
 Name: rubygem-%{gemname}
-Version: 3.1.4
+Version: 3.1.7
 Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
@@ -15,6 +15,7 @@ URL: http://sass-lang.com/
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
 Patch1: rubygem-sass-3.1.4-fix-util-require.patch
 Patch2: rubygem-sass-3.1.4-fix-cache_stores-require.patch
+Patch3: sass-3.1.7-tests-fix.patch
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: rubygem(fssm)
@@ -54,6 +55,7 @@ rm .yardopts
 rm -rf vendor
 %patch1
 %patch2
+%patch3
 
 %build
 
diff --git a/sass-3.1.7-tests-fix.patch b/sass-3.1.7-tests-fix.patch
new file mode 100644
index 0000000..256640d
--- /dev/null
+++ b/sass-3.1.7-tests-fix.patch
@@ -0,0 +1,17 @@
+--- test/sass/scss/scss_test.rb.orig	2011-09-28 11:19:05.000000000 -0400
++++ test/sass/scss/scss_test.rb	2011-09-28 11:19:22.000000000 -0400
+@@ -118,11 +118,11 @@ SCSS
+   def test_warn_directive
+     expected_warning = <<EXPECTATION
+ WARNING: this is a warning
+-        on line 2 of test_warn_directive_inline.scss
++         on line 2 of test_warn_directive_inline.scss
+ 
+ WARNING: this is a mixin
+-        on line 1 of test_warn_directive_inline.scss, in `foo'
+-        from line 3 of test_warn_directive_inline.scss
++         on line 1 of test_warn_directive_inline.scss, in `foo'
++         from line 3 of test_warn_directive_inline.scss
+ EXPECTATION
+     assert_warning expected_warning do
+       assert_equal <<CSS, render(<<SCSS)
diff --git a/sources b/sources
index c35cfdf..e872a90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0062c2e56ec5641bdfb66c92e5826759  sass-3.1.4.gem
+2ddaa60fae07996b82d562df87104f4f  sass-3.1.7.gem