Merge pull request #8250 from vpereira/revert_sassc_update

Revert update from sassc gem
openSUSE · Sep 3, 2019 · 21b033c · 21b033c
2 parents 43c3ad1 + 747e75d
commit 21b033c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/dist/obs-bundled-gems.spec b/dist/obs-bundled-gems.spec
@@ -43,6 +43,7 @@ BuildRequires:  openldap2-devel
 BuildRequires:  python-devel
 BuildRequires:  ruby2.5-devel
 BuildRequires:  rubygem(ruby:2.5.0:bundler)
+BuildRequires:  chrpath
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -140,6 +141,9 @@ find %{buildroot} -type f -print0 | xargs -0 grep -l /usr/bin/env | while read f
   chmod a-x $file
 done
 
+# Remove rpaths from files
+chrpath --delete %{buildroot}%_libdir/obs-api/ruby/*/gems/sassc-*-x86_64-linux/lib/sassc/libsass.so
+
 %files
 %_libdir/obs-api
 

diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -190,6 +190,8 @@ group :assets do
   gem 'cssmin', '>= 1.0.2'
   # for minifying JavaScript
   gem 'uglifier', '>= 1.2.2'
+  # sassc 2.2.0 is throwing exception
+  gem 'sassc', '~> 2.1.0'
   # to use sass in the asset pipeline
   gem 'sassc-rails'
   # assets for jQuery DataTables

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -385,7 +385,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sassc (2.2.0)
+    sassc (2.1.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -544,6 +544,7 @@ DEPENDENCIES
   rubocop-rspec
   ruby-ldap
   sanitize
+  sassc (~> 2.1.0)
   sassc-rails
   selenium-webdriver
   shoulda-matchers (~> 4.0)