From 79bc608528bc581b4048de87726aba326185989e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Oct 2019 10:49:14 +0200
Subject: v1.0.5

---
 composer.json            |  2 +-
 php-scssphp-scssphp.spec | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 884ddb6..ff0590f 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",
-        "phpunit/phpunit": ">=4.8.36",
+        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
         "twbs/bootstrap": "~4.3",
         "zurb/foundation": "~6.5"
     },
diff --git a/php-scssphp-scssphp.spec b/php-scssphp-scssphp.spec
index 5f171fc..c7f9639 100644
--- a/php-scssphp-scssphp.spec
+++ b/php-scssphp-scssphp.spec
@@ -12,7 +12,7 @@
 
 %global with_tests   0%{!?_without_tests:1}
 # Github
-%global gh_commit    7c292c66db52ede3afbfd6566c8872f3c5b32267
+%global gh_commit    98e10149058102817b493c5a147fa582cb62d46e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     scssphp
 %global gh_project   scssphp
@@ -25,7 +25,7 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Compiler for SCSS
 
@@ -50,16 +50,16 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # For tests, from composer.json "require-dev": {
 #        "squizlabs/php_codesniffer": "~2.5",
-#        "phpunit/phpunit": ">=4.8.36",
+#        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
 #        "twbs/bootstrap": "~4.3",
 #        "zurb/foundation": "~6.5"
 # remirepo:1
 %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-BuildRequires:  phpunit8
+BuildRequires:  phpunit8 >= 8.3
 %global phpunit %{_bindir}/phpunit8
 # remirepo:4
 %else
-BuildRequires:  php-composer(phpunit/phpunit) >= 4.8.36
+BuildRequires:  php-composer(phpunit/phpunit) >= 5.7
 %global phpunit %{_bindir}/phpunit
 %endif
 %endif
@@ -122,8 +122,8 @@ php -r '
 '
 
 %if %{with_tests}
-mkdir -p vendor/composer/
-cat << 'EOF' | tee vendor/composer/autoload_real.php
+mkdir -p vendor/
+cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests');
@@ -136,7 +136,12 @@ ret=0
 for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
    if which $cmdarg; then
       set $cmdarg
-      $1 ${2:-%{_bindir}/phpunit8} --no-coverage --verbose || ret=1
+      if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ] ; then
+        # see https://github.com/scssphp/scssphp/issues/51
+        $1 ${2:-%{_bindir}/phpunit8} --filter '^((?!(testTests|testEncode)).)*$' --no-coverage --verbose || ret=1
+      else
+        $1 ${2:-%{_bindir}/phpunit8} --no-coverage --verbose || ret=1
+      fi
    fi
 done
 exit $ret
@@ -157,5 +162,8 @@ exit $ret
 
 
 %changelog
+* Fri Oct  4 2019 Remi Collet <remi@remirepo.net> - 1.0.5-1
+- update to 1.0.5
+
 * Thu Sep 12 2019 Remi Collet <remi@remirepo.net> - 1.0.4-1
 - initial package
-- 
cgit