diff --git a/.gitignore b/.gitignore index 3958398..1c92fe7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/sass-spec-libsass-3.6.3.tar.gz -SOURCES/sassc-3.6.2.tar.gz +SOURCES/3.4.1.tar.gz +SOURCES/sass-spec-3.4.1.tar.gz diff --git a/.sassc.metadata b/.sassc.metadata index 1a5de4c..3cfdaa2 100644 --- a/.sassc.metadata +++ b/.sassc.metadata @@ -1,2 +1,2 @@ -cd4c3c265847042c513afcbfb9e0b9bee8a9d4ca SOURCES/sass-spec-libsass-3.6.3.tar.gz -87e0f04be4609a054fa5198f5a896f5e85aa2a5f SOURCES/sassc-3.6.2.tar.gz +97020dcf5d0a8f2cad8c6e8672c4a837c8fd9a05 SOURCES/3.4.1.tar.gz +bb2770c5c85ca5bb7b4e6ad191d4c11187e6d841 SOURCES/sass-spec-3.4.1.tar.gz diff --git a/SOURCES/sassc-3.3.6-build.patch b/SOURCES/sassc-3.3.6-build.patch new file mode 100644 index 0000000..6fd7587 --- /dev/null +++ b/SOURCES/sassc-3.3.6-build.patch @@ -0,0 +1,15 @@ +diff -up ./Makefile.orig ./Makefile +--- ./Makefile.orig 2016-04-23 11:23:54.000000000 +0200 ++++ ./Makefile 2016-08-23 17:04:39.406832259 +0200 +@@ -196,9 +196,8 @@ install: $(DESTDIR)$(PREFIX)/$(SASSC_EXE + build-static: $(RESOURCES) $(OBJECTS) $(LIB_STATIC) + $(CC) $(LDFLAGS) -o $(SASSC_EXE) $^ $(LDLIBS) + +-build-shared: $(RESOURCES) $(OBJECTS) $(LIB_SHARED) +- $(CC) $(LDFLAGS) -o $(SASSC_EXE) $^ $(LDLIBS) +- $(CP) $(LIB_SHARED) bin/. ++build-shared: $(RESOURCES) $(OBJECTS) ++ $(CC) $(LDFLAGS) -o $(SASSC_EXE) $^ $(LDLIBS) -lsass + + $(LIB_STATIC): libsass-static + $(LIB_SHARED): libsass-shared diff --git a/SPECS/sassc.spec b/SPECS/sassc.spec index d116f92..32db98e 100644 --- a/SPECS/sassc.spec +++ b/SPECS/sassc.spec @@ -1,40 +1,31 @@ -%global testspec_version 3.6.3 -%if 0%{?epel} && 0%{?epel} <= 7 -%define with_tests 0 -%else -%define with_tests 1 -%endif +%global testspec_version 3.4.1 Name: sassc -Version: 3.6.2 -Release: 3%{?dist} +Version: 3.4.1 +Release: 2%{?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}/%{name}-%{version}.tar.gz +Source0: https://github.com/sass/sassc/archive/%{version}.tar.gz # Test suite spec. According to this comment from an upstream dev, we should # not use the release tags on the test spec: # https://github.com/sass/libsass/issues/2258#issuecomment-268196004 # https://github.com/sass/sass-spec/archive/master.zip -# https://github.com/sass/sass-spec/archive/v%%{testspec_version}.tar.gz -Source1: sass-spec-libsass-%{testspec_version}.tar.gz - -BuildRequires: automake -BuildRequires: libtool -BuildRequires: make -BuildRequires: libsass-devel >= %{version} -BuildRequires: gcc-c++ -%if %{with_tests} +# https://github.com/sass/sass-spec/archive/v%{testspec_version}.tar.gz +Source1: sass-spec-%{testspec_version}.tar.gz + +# libsass is built as a shared library. +Patch0: %{name}-3.3.6-build.patch + +BuildRequires: libsass-devel >= 3.4.0 # For the test suite BuildRequires: ruby %if 0%{?epel} && 0%{?epel} <= 7 BuildRequires: rubygem-minitest5 %else -BuildRequires: rubygem-hrx BuildRequires: rubygem-minitest %endif -%endif %description SassC is a wrapper around libsass used to generate a useful command-line @@ -42,35 +33,26 @@ application that can be installed and packaged for several operating systems. %prep -%autosetup -a 1 -mv sass-spec-libsass-%{testspec_version} sass-spec -autoreconf -fiv +%setup -q -a 1 +mv sass-spec-%{testspec_version} sass-spec +%patch0 -p0 -b .build %build -%configure -%make_build +%make_build build-shared \ + LDFLAGS="$RPM_OPT_FLAGS" \ + CFLAGS="$RPM_OPT_FLAGS" \ + CXXFLAGS="$RPM_OPT_FLAGS" %install -%make_install +rm -rf $RPM_BUILD_ROOT +install -p -m755 -D bin/sassc $RPM_BUILD_ROOT%{_bindir}/%{name} + -%if %{with_tests} %check -rm sass-spec/spec/basic/12_pseudo_classes_and_elements.hrx -rm sass-spec/spec/basic/44_bem_selectors.hrx -rm sass-spec/spec/extend-tests/018_test_id_unification.hrx -rm sass-spec/spec/extend-tests/065_test_attribute_unification.hrx -rm sass-spec/spec/extend-tests/066_test_attribute_unification.hrx -rm sass-spec/spec/extend-tests/067_test_attribute_unification.hrx -rm sass-spec/spec/extend-tests/068_test_attribute_unification.hrx -rm sass-spec/spec/extend-tests/070_test_pseudo_unification.hrx -rm sass-spec/spec/extend-tests/071_test_pseudo_unification.hrx -rm sass-spec/spec/extend-tests/074_test_pseudo_unification.hrx -rm sass-spec/spec/extend-tests/087_test_negation_unification.hrx -rm sass-spec/spec/libsass-closed-issues/issue_2520.hrx -ruby sass-spec/sass-spec.rb -c ./%{name} --impl libsass sass-spec/spec -%endif +ruby sass-spec/sass-spec.rb -V 3.4 -c bin/%{name} --impl libsass sass-spec/spec + %files %license LICENSE @@ -79,68 +61,8 @@ ruby sass-spec/sass-spec.rb -c ./%{name} --impl libsass sass-spec/spec %changelog -* Mon Jul 17 2023 Arkady L. Shane - 3.6.2-3 -- Rebuilt for MSVSphere 9.2 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Leigh Scott - 3.6.2-2 -- Use configure and enable tests - -* Fri May 21 2021 Leigh Scott - 3.6.2-1 -- Upgrade to 3.6.2 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 03 2020 Leigh Scott - 3.6.1-6 -- Disable tests - -* Sat Aug 01 2020 Fedora Release Engineering - 3.6.1-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 3.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 06 2019 Leigh Scott - 3.6.1-2 -- Add build requires rubygem-hrx and enable tests for fedora - -* Mon Dec 02 2019 Leigh Scott - 3.6.1-1 -- Upgrade to 3.6.1, tests 3.6.3 -- Disable tests they fail due to missing rubygem-hrx - -* Fri Jul 26 2019 Fedora Release Engineering - 3.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 19 2018 Kevin Fenzi - 3.5.0-1 -- Upgrade to 3.5.0, tests 3.5.4. -- Fixes FTBFS. - -* Sat Jul 14 2018 Fedora Release Engineering - 3.4.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.4.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 24 2017 Aurelien Bompard - 3.4.5-2 -- Require the same libsass version - -* Mon Jul 24 2017 Aurelien Bompard - 3.4.5-1 -- Version 3.4.5: https://github.com/sass/sassc/releases/tag/3.4.5 +* Tue Dec 12 2017 Arkady L. Shane - 3.4.1-2 +- Rebuilt for MSVSphere 8.9 * Sat Feb 11 2017 Fedora Release Engineering - 3.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild