[rubygem-sass-rails] Update to 5.0.1
Josef Stribny
jstribny at fedoraproject.org
Mon Feb 16 13:37:20 UTC 2015
commit a8c22b773a43df54081b336fa6d74e9ef2e2d54c
Author: Josef Stribny <jstribny at redhat.com>
Date: Mon Feb 16 14:36:58 2015 +0100
Update to 5.0.1
.gitignore | 2 +
...rter-instead-of-monkey-patching-sprockets.patch | 152 ----------------
...-restore-special-behavior-in-sassimporter.patch | 190 --------------------
...ate-instead-of-monkey-patching-spsrockets.patch | 129 -------------
rubygem-sass-rails.spec | 40 ++---
sources | 3 +-
6 files changed, 22 insertions(+), 494 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04c9748..e20688b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/sass-rails-3.2.6.gem
/sass-rails-4.0.0.gem
/sass-rails-4.0.3.gem
+/sass-rails-5.0.1-tests.tgz
+/sass-rails-5.0.1.gem
diff --git a/rubygem-sass-rails.spec b/rubygem-sass-rails.spec
index a229114..10d569a 100644
--- a/rubygem-sass-rails.spec
+++ b/rubygem-sass-rails.spec
@@ -3,24 +3,21 @@
Summary: Sass adapter for the Rails asset pipeline
Name: rubygem-%{gem_name}
-Version: 4.0.3
+Version: 5.0.1
Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: https://github.com/rails/sass-rails
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Fix compatibility with sprockets 3.12.
-# https://github.com/rails/sass-rails/commit/a62bdf85e56a678aa5fded3d4ed0d10bbc0b7a7b
-Patch0: rubygem-sass-rails-4.0.3-template-instead-of-monkey-patching-spsrockets.patch
-# https://github.com/rails/sass-rails/commit/bd63297c31aceb079595c3a3d9007b0e4df505b6
-Patch1: rubygem-sass-rails-4.0.3-own-importer-instead-of-monkey-patching-sprockets.patch
-# https://github.com/rails/sass-rails/commit/e56c2fbf60ef2bd879aae6f6163c90326b4017be
-Patch2: rubygem-sass-rails-4.0.3-restore-special-behavior-in-sassimporter.patch
+# git clone https://github.com/rails/sass-rails.git && cd sass-rails
+# git checkout v5.0.1 && tar czvf sass-rails-5.0.1-tests.tgz ./test
+Source1: sass-rails-%{version}-tests.tgz
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
BuildRequires: rubygem(bundler)
BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(tilt)
BuildRequires: rubygem(rails)
BuildRequires: rubygem(sass)
BuildRequires: rubygem(sprockets)
@@ -44,12 +41,7 @@ gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
-# Use .gemspec shipped with gem, since one patch modifies the dependencies.
-# gem spec %%{SOURCE0} -l --ruby > %%{gem_name}.gemspec
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build
gem build %{gem_name}.gemspec
@@ -64,16 +56,21 @@ cp -a .%{gem_dir}/* \
%check
pushd .%{gem_instdir}
+tar xf %{SOURCE1}
# Use just locally available gems.
sed -i -r 's/runcmd "bundle install --verbose/\0 --local/' test/support/sass_rails_test_case.rb
# Explicitly depend on RDoc.
echo 'gem "rdoc"' >> Gemfile
-sed -i '/possible_dev_dependencies/ s/%w(/%w(rdoc /' test/test_helper.rb
+echo 'gem "rails"' >> Gemfile
+echo 'gem "sass"' >> Gemfile
-# Require action_controller explicitely. This should be fixed with RoR 4.1.2+.
-# https://github.com/rails/sass-rails/issues/205
-ruby -I.:test -raction_controller -e 'Dir.glob "test/**/*_test.rb", &method(:require)'
+# Copy in .gemspec and use the sass-rails sources
+cp %{buildroot}%{gem_spec} sass-rails.gemspec
+echo 'gem "sass-rails", :path => "."' >> Gemfile
+echo 'gem "sprockets-rails"' >> Gemfile
+sed -i '/possible_dev_dependencies/ s/%w(/%w(rdoc /' test/test_helper.rb
+ruby -I.:test -e 'Dir.glob "test/**/*_test.rb", &method(:require)'
popd
@@ -89,15 +86,14 @@ popd
%doc %{gem_docdir}
%doc %{gem_instdir}/README.md
%doc %{gem_instdir}/CHANGELOG.md
-%{gem_instdir}/Gemfile
-%{gem_instdir}/Rakefile
-%{gem_instdir}/sass-rails.gemspec
-%{gem_instdir}/sass-rails.gemspec.erb
# Leave out the test suite, since rpmlint complains a lot about dot and
# empty files.
%exclude %{gem_instdir}/test
%changelog
+* Mon Feb 16 2015 Josef Stribny <jstribny at redhat.com> - 5.0.1-1
+- Update to 5.0.1
+
* Tue Jul 01 2014 Vít Ondruch <vondruch at redhat.com> - 4.0.3-1
- Update to sass-rails 4.0.3.
diff --git a/sources b/sources
index de3ba34..34a7d04 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-43797e2bfad4181b408eadd67bd51ee2 sass-rails-4.0.3.gem
+9cd0021ac0095fa9cd427b6e313609e8 sass-rails-5.0.1-tests.tgz
+e758a8458fc06b25acb7c37d0ee0ddd4 sass-rails-5.0.1.gem
More information about the scm-commits
mailing list