Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert update from sassc gem #8250

Merged
merged 1 commit into from
Sep 3, 2019
Merged

Revert update from sassc gem #8250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dist/obs-bundled-gems.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions src/api/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/api/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -544,6 +544,7 @@ DEPENDENCIES
rubocop-rspec
ruby-ldap
sanitize
sassc (~> 2.1.0)
sassc-rails
selenium-webdriver
shoulda-matchers (~> 4.0)
Expand Down