Created
October 27, 2020 12:43
-
-
Save pvalena/ad00986351a4f7ba6b7c661ab14580e3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 0668cf1edbae1f2fb7f2cc0e75865a9754e5b0c1 | |
| Author: Pavel Valena <pvalena@redhat.com> | |
| Date: Tue Oct 27 12:49:07 2020 +0100 | |
| Fixup | |
| diff --git a/.gitignore b/.gitignore | |
| index 26343cb..33a3402 100644 | |
| --- a/.gitignore | |
| +++ b/.gitignore | |
| @@ -1,2 +1 @@ | |
| -sassc-rails-*.gem | |
| -sassc-rails-*.gem | |
| +/sassc-rails-*.gem | |
| diff --git a/rubygem-sassc-rails.spec b/rubygem-sassc-rails.spec | |
| index a55fc30..8ec82c9 100644 | |
| --- a/rubygem-sassc-rails.spec | |
| +++ b/rubygem-sassc-rails.spec | |
| @@ -1,27 +1,25 @@ | |
| # Generated from sassc-rails-2.1.2.gem by gem2rpm -*- rpm-spec -*- | |
| %global gem_name sassc-rails | |
| -%bcond_with bundler | |
| - | |
| Name: rubygem-%{gem_name} | |
| Version: 2.1.2 | |
| -Release: 1%{?dist} | |
| +Release: 1.3%{?dist} | |
| Summary: Integrate SassC-Ruby into Rails | |
| -License: MIT | |
| +# SIL license found in | |
| +# test/dummy/app/assets/stylesheets/erb_render_with_context.css.erb | |
| +# https://github.com/sass/sassc-rails/issues/155 | |
| +License: MIT and OFL | |
| URL: https://github.com/sass/sassc-rails | |
| Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem | |
| BuildRequires: ruby(release) | |
| BuildRequires: rubygems-devel | |
| BuildRequires: ruby | |
| BuildRequires: rubygem(mocha) | |
| -BuildRequires: rubygem(sprockets) | |
| -BuildRequires: rubygem(sass) | |
| -%if %{with bundler} | |
| -BuildRequires: rubygem(bundler) | |
| -%endif | |
| -BuildRequires: rubygem(minitest) | |
| -BuildRequires: rubygem(activesupport) | |
| -BuildRequires: rubygem(rails) | |
| +BuildRequires: rubygem(sprockets-rails) | |
| +BuildRequires: rubygem(sass-rails) | |
| +BuildRequires: rubygem(sassc) | |
| +BuildRequires: rubygem(railties) | |
| +BuildRequires: rubygem(tilt) | |
| BuildArch: noarch | |
| %description | |
| @@ -50,36 +48,21 @@ cp -a .%{gem_dir}/* \ | |
| %check | |
| pushd .%{gem_instdir} | |
| + | |
| +# Copy in .gemspec and use the sass-rails sources | |
| +cp %{buildroot}%{gem_spec} sassc-rails.gemspec | |
| + | |
| # Avoid unnecessary dependency | |
| sed -i -e '/require .pry./ s/^/#/g' test/test_helper.rb | |
| +sed -i -e '/dependency.*pry./ s/^/#/' sassc-rails.gemspec | |
| +sed -i -e '/dependency.*rake./ s/^/#/' sassc-rails.gemspec | |
| -%if %{without bundler} | |
| sed -i -e '/Bundler\.require/ s/^/#/g' \ | |
| - -e '/require .bundler./ s/^/#/g' test/test_helper.rb | |
| - | |
| -%else | |
| -cat > ../Gemfile <<EOF | |
| -gem 'mocha' | |
| -gem 'bundler' | |
| -gem 'sass' | |
| -gem 'sprockets' | |
| -gem 'minitest' | |
| -gem 'activesupport' | |
| -gem 'rails' | |
| -gem 'bundler' | |
| -EOF | |
| - | |
| -export BUNDLE_GEMFILE=${PWD}/../Gemfile | |
| -%endif | |
| - | |
| -# There are errors due to CSS formatting, and absence of Bundler | |
| -# https://gist.github.com/pvalena/37fdb368fd96132c1af8f843a4a7f0f8 | |
| -ruby -Ilib:test -rsprockets/railtie -e 'Dir.glob "./test/**/*.rb", &method(:require)' \ | |
| -%if %{without bundler} | |
| - | tee -a /dev/stderr \ | |
| - | grep '20 runs, 41 assertions, 7 failures, 5 errors, 2 skips' | |
| -%endif | |
| -%{nil} | |
| + -e '/require .bundler./ s/^/#/g' \ | |
| + test/test_helper.rb | |
| + | |
| +ruby -Ilib:test -rsass-rails -rsprockets/railtie -e 'Dir.glob "./test/**/*.rb", &method(:require)' | |
| + | |
| popd | |
| %files | |
| @@ -101,5 +84,5 @@ popd | |
| %doc %{gem_instdir}/CODE_OF_CONDUCT.md | |
| %changelog | |
| -* Fri Sep 25 2020 Pavel Valena <pvalena@redhat.com> - 2.1.2-1 | |
| +* Fri Sep 25 2020 Pavel Valena <pvalena@redhat.com> - 2.1.2-1.3 | |
| - Initial package |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment