This commit is contained in:
Aurélien Bompard 2016-12-12 12:38:28 +01:00
parent 91e88f8818
commit 6952e31142
4 changed files with 15 additions and 38 deletions

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
/3.3.3.tar.gz
/3.3.6.tar.gz
/3.4.0.tar.gz
/sass-spec-3.4.0.tar.gz

View File

@ -1,26 +0,0 @@
diff -up ./sass-spec/lib/sass_spec/test_case.rb.orig ./lib/sass_spec/test_case.rb
--- ./sass-spec/lib/sass_spec/test_case.rb.orig 2016-08-23 18:26:23.580890816 +0200
+++ ./sass-spec/lib/sass_spec/test_case.rb 2016-08-23 18:26:32.128000099 +0200
@@ -149,7 +149,7 @@ class SassSpec::TestCase
err.gsub(/(?:\/todo_|_todo\/)/, "/") # hide todo pre/suffix
.gsub(/\/libsass\-[a-z]+\-tests\//, "/") # hide test directory
.gsub(/\/libsass\-[a-z]+\-issues\//, "/libsass-issues/") # normalize issue specs
- .gsub(/[\w\/\-\\:]+?[\/\\]spec[\/\\]+/, "/sass/spec/") # normalize abs paths
+ .gsub(/[\w\/\-\\:\.]+?[\/\\]spec[\/\\]+/, "/sass/spec/") # normalize abs paths
.sub(/(?:\r?\n)*\z/, "\n") # make sure we have exactly one trailing linefeed
.sub(/\A(?:\r?[\n\s])+\z/, "") # clear the whole file if only whitespace
end
Fix a known failing test:
diff -up ./spec/libsass-closed-issues/issue_1651/without/input.scss.orig ./spec/libsass-closed-issues/issue_1651/without/input.scss
--- ./sass-spec/spec/libsass-closed-issues/issue_1651/without/input.scss.orig 2016-08-23 18:35:38.065980418 +0200
+++ ./sass-spec/spec/libsass-closed-issues/issue_1651/without/input.scss 2016-08-23 18:35:45.978081581 +0200
@@ -3,7 +3,5 @@
}
.b {
- @at-root (without: media) {
@extend .a;
- }
}

View File

@ -1,22 +1,21 @@
%global testspec_version 3.3.3
%global testspec_version 3.4.0
Name: sassc
Version: 3.3.6
Version: 3.4.0
Release: 1%{?dist}
Summary: Wrapper around libsass to compile CSS stylesheet
License: MIT
URL: http://github.com/sass/sassc
Source0: https://github.com/sass/sassc/archive/%{version}.tar.gz
# Test suite
Source1: https://github.com/sass/sass-spec/archive/%{testspec_version}.tar.gz
# Test suite (not using the URL because of conflicting filenames)
# https://codeload.github.com/sass/sass-spec/tar.gz/%{testspec_version}
Source1: sass-spec-%{testspec_version}.tar.gz
# libsass is built as a shared library.
Patch0: %{name}-3.3.6-build.patch
# Fix a regexp in the testsuite and a known failing test.
Patch1: %{name}-3.3.6-testsuite.patch
BuildRequires: libsass-devel
BuildRequires: libsass-devel >= 3.4.0
# For the test suite
BuildRequires: ruby
%if 0%{?epel} && 0%{?epel} <= 7
@ -34,7 +33,6 @@ application that can be installed and packaged for several operating systems.
%setup -q -a 1
mv sass-spec-%{testspec_version} sass-spec
%patch0 -p0 -b .build
%patch1 -p0 -b .testsuite
%build
@ -50,15 +48,18 @@ install -p -m755 -D bin/sassc $RPM_BUILD_ROOT%{_bindir}/%{name}
%check
ruby sass-spec/sass-spec.rb -c bin/%{name} --ignore-todo sass-spec/spec
ruby sass-spec/sass-spec.rb -V 3.4 -c bin/%{name} --impl libsass sass-spec/spec
%files
%license LICENSE
%doc Readme.md TODO
%doc Readme.md
%{_bindir}/%{name}
%changelog
* Mon Dec 12 2016 Aurelien Bompard <abompard@fedoraproject.org> - 3.4.0-1
- version 3.4.0: https://github.com/sass/sassc/releases/tag/3.4.0
* Tue Aug 23 2016 Aurelien Bompard <abompard@fedoraproject.org> - 3.3.6-1
- initial package

View File

@ -1,2 +1,2 @@
17f7d80f127d6f33f1e970d1d4432125 3.3.3.tar.gz
4aa32fa985933b6ea6a3c574cf73c431 3.3.6.tar.gz
SHA512 (3.4.0.tar.gz) = add5722948a07b3493a24a2d90e3da77fcd5b156e53b02330096408f528c8b10509d8dce006f81182238a8a34dca1e3fb6b44b4938864c07d1b53dbfbee608b1
SHA512 (sass-spec-3.4.0.tar.gz) = a0709ed2c3f1ef4fcd3b79bdef68dfd1cf74191720817d79977a712be36b9e0573ff1cf4aa8f05e08bbf67a0ac66a73ae77a2f071fefc72e48dd4994865030bf