From 3718b5cbdeb603e04ff7c7ebd5064ca283ce9fc8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Sep 2019 13:19:52 +0200 Subject: sync with Fedora --- php-Assetic.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/php-Assetic.spec b/php-Assetic.spec index be271db..87c2b55 100644 --- a/php-Assetic.spec +++ b/php-Assetic.spec @@ -74,7 +74,7 @@ Name: php-Assetic Version: %{github_version} -Release: 8%{?dist} +Release: 10%{?dist} Summary: Asset Management for PHP License: MIT @@ -253,6 +253,10 @@ cp -rp src/Assetic %{buildroot}%{phpdir}/ rm -f \ tests/Assetic/Test/Asset/HttpAssetTest.php \ tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php +sed 's/function testMinimizeHandlebars/function SKIP_testMinimizeHandlebars/' \ + -i tests/Assetic/Test/Filter/HandlebarsFilterTest.php +sed 's/function testCompassExtensionCanBeDisabled/function SKIP_testCompassExtensionCanBeDisabled/' \ + -i tests/Assetic/Test/Filter/ScssphpFilterTest.php : skip for https://github.com/kriswallsmith/assetic/issues/863 rm tests/Assetic/Test/Filter/UglifyJs2FilterTest.php @@ -268,7 +272,7 @@ BOOTSTRAP : Upstream tests with SCLs if available SCL_RETURN_CODE=0 -for SCL in php70 php71 php72 php73; do +for SCL in php71 php72 php73 php74; do if which $SCL; then $SCL %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || SCL_RETURN_CODE=1 fi @@ -290,6 +294,9 @@ exit $SCL_RETURN_CODE %changelog +* Sat Sep 14 2019 Shawn Iwinski - 1.4.0-10 +- Fix FTBFS (RHBZ #1736429) + * Thu Feb 14 2019 Shawn Iwinski - 1.4.0-8 - Disable Ruby Compass for Fedora >= 29 to fix FTBFS because dependency FTBFS "nothing provides rubygem(sass) < 3.5 needed by rubygem-compass" -- cgit