From 51587cffaf131962fb3e88b2ec3109bad4742cbb Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Jun 06 2018 09:58:52 +0000
Subject: Update to Sass 3.5.6.


---

diff --git a/.gitignore b/.gitignore
index 9bbf0e7..01a766d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ sass-3.2.3.gem/sass-3.2.6.gem
 /sass-3.4.22.gem
 /sass-3.4.23.gem
 /sass-3.4.25.gem
+/sass-3.5.6.gem
diff --git a/rubygem-sass-3.4.25-interpolation-crash.patch b/rubygem-sass-3.4.25-interpolation-crash.patch
deleted file mode 100644
index 66db64d..0000000
--- a/rubygem-sass-3.4.25-interpolation-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 139e86e32506dbd8c301b1241f9b79aeed9cb696 Mon Sep 17 00:00:00 2001
-From: Natalie Weizenbaum <nweiz@google.com>
-Date: Wed, 4 Oct 2017 15:20:18 -0700
-Subject: [PATCH] Fix custom property interpolation (#2384)
-
-Interpolation that included the full property name (such as --#{foo})
-was crashing the parser.
-
-Closes #2383
----
- lib/sass/scss/rx.rb       | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/sass/scss/rx.rb b/lib/sass/scss/rx.rb
-index 2c48a77f..16963d1e 100644
---- a/lib/sass/scss/rx.rb
-+++ b/lib/sass/scss/rx.rb
-@@ -127,7 +127,7 @@
-       OPTIONAL = /!#{W}optional/i
-       IDENT_START = /-|#{NMSTART}/
- 
--      IDENT_HYPHEN_INTERP = /-(#\{)/
-+      IDENT_HYPHEN_INTERP = /-+(#\{)/
-       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|#{ESCAPE})*)\"/
-       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|#{ESCAPE})*)\'/
-       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
-
diff --git a/rubygem-sass-3.5.6-use-listen.patch b/rubygem-sass-3.5.6-use-listen.patch
new file mode 100644
index 0000000..5c00a9d
--- /dev/null
+++ b/rubygem-sass-3.5.6-use-listen.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/sass/plugin/compiler.rb b/lib/sass/plugin/compiler.rb
+index f3ae6e3d..3979bf30 100644
+--- a/lib/sass/plugin/compiler.rb
++++ b/lib/sass/plugin/compiler.rb
+@@ -377,8 +377,8 @@ module Sass::Plugin
+ 
+     # This is mocked out in compiler_test.rb.
+     def create_listener(*args, &block)
+-      require 'sass-listen'
+-      SassListen.to(*args, &block)
++      require 'listen'
++      Listen.to(*args, &block)
+     end
+ 
+     def remove_redundant_directories(directories)
diff --git a/rubygem-sass.spec b/rubygem-sass.spec
index 98c49dc..a59589e 100644
--- a/rubygem-sass.spec
+++ b/rubygem-sass.spec
@@ -2,18 +2,20 @@
 %global gem_name sass
 
 Name: rubygem-%{gem_name}
-Version: 3.4.25
-Release: 4%{?dist}
+Version: 3.5.6
+Release: 1%{?dist}
 Summary: A powerful but elegant CSS compiler that makes CSS fun again
 Group: Development/Languages
 License: MIT
 URL: http://sass-lang.com/
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Backported fix for a bug that affects bootstrap
-# https://github.com/sass/ruby-sass/commit/139e86e32506dbd8c301b1241f9b79aeed9cb696
-Patch0: rubygem-sass-3.4.25-interpolation-crash.patch
+# Use listen as a depencency instead of sass-listen.
+# sass-listen is a fork from original listen v3.0 branch to support Ruby <= 2.1.
+# https://github.com/sass/ruby-sass/pull/65
+Patch0: rubygem-sass-3.5.6-use-listen.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
+BuildRequires: rubygem(listen)
 BuildRequires: rubygem(minitest)
 BuildArch: noarch
 %if 0%{?rhel} == 7
@@ -40,9 +42,11 @@ Documentation for %{name}.
 gem unpack %{SOURCE0}
 
 %setup -q -D -T -n  %{gem_name}-%{version}
-%patch0 -p1
 
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%gemspec_remove_dep -g sass-listen -s %{gem_name}.gemspec
+%gemspec_add_dep -g listen -s %{gem_name}.gemspec
+%patch0 -p1
 
 %build
 
@@ -50,12 +54,6 @@ gem build %{gem_name}.gemspec
 
 %gem_install
 
-pushd .%{gem_instdir}
-# Remove bundled rubygem-listener:
-# https://github.com/nex3/sass/issues/458
-rm -rf vendor
-popd
-
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
@@ -72,12 +70,6 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 find %{buildroot}%{gem_instdir}/bin -type f | \
   xargs sed -i 's|^#!/usr/bin/env ruby|#!/usr/bin/ruby|'
 
-# Remove uneeded shebang and executable bit
-# https://github.com/sass/sass/pull/2342
-grep -rl '^#!/usr/bin/env ruby' %{buildroot}%{gem_instdir}/test | \
-  xargs sed -i '/#!\/usr\/bin\/env ruby/d'
-find %{buildroot}%{gem_instdir}/test -type f -perm -u=x | xargs chmod -x
-
 %check
 pushd .%{gem_instdir}
 ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
@@ -111,6 +103,9 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Fri Jun 01 2018 Jun Aruga <jaruga@redhat.com> - 3.5.6-1
+- Update to Sass 3.5.6.
+
 * Mon May 28 2018 Adam Williamson <awilliam@redhat.com> - 3.4.25-4
 - Backport fix for a parser error that affects bootstrap
 
diff --git a/sources b/sources
index 98b90f6..5b62fc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sass-3.4.25.gem) = 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
+SHA512 (sass-3.5.6.gem) = de7ac9598a36e60cdb440b6c8b36fed638ce3384ff078000c4d59eccb76b65d1c944aad8568ee078d6f2ca228d4f4c512143065bc20c5f91d28c2f0a170de96e