From a98b92caac0776f9952cdefdfb77c34bf021676f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Dec 2018 18:28:42 +0100 Subject: add dependency on leafo/scssphp 0.7.7 temporarily disable test suite add weak dependency on selinux extension --- glpi.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/glpi.spec b/glpi.spec index daa56ed..428b0df 100644 --- a/glpi.spec +++ b/glpi.spec @@ -35,7 +35,8 @@ %endif # remirepo:5 -%if 0%{?fedora} < 19 && 0%{?rhel} < 8 +#if 0%%{?fedora} < 19 && 0%%{?rhel} < 8 +%if 1 # MySQL need another bootstrap method # GLPI requires MySQL >= 5.6 or MariaDB >= 10 %global with_tests 0%{?_with_tests:1} @@ -107,7 +108,7 @@ BuildRequires: (php-composer(paragonie/random_compat) >= 2.0 with php BuildRequires: (php-composer(monolog/monolog) >= 1.23 with php-composer(monolog/monolog) < 2) BuildRequires: (php-composer(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 2) BuildRequires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4) -BuildRequires: (php-composer(leafo/scssphp) >= 0.7 with php-composer(leafo/scssphp) < 1) +BuildRequires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) # requires-dev BuildRequires: (php-composer(guzzlehttp/guzzle) >= 6 with php-composer(guzzlehttp/guzzle) < 7) BuildRequires: (php-composer(atoum/atoum) >= 3.3 with php-composer(atoum/atoum) < 4) @@ -145,7 +146,7 @@ BuildRequires: php-composer(monolog/monolog) >= 1.23 BuildRequires: php-composer(elvanto/litemoji) < 2 BuildRequires: php-composer(elvanto/litemoji) >= 1.4 BuildRequires: php-composer(leafo/scssphp) < 1 -BuildRequires: php-composer(leafo/scssphp) >= 0.7 +BuildRequires: php-composer(leafo/scssphp) >= 0.7.7 BuildRequires: php-symfon3-console >= 3.4 # requires-dev BuildRequires: php-composer(guzzlehttp/guzzle) < 7 @@ -222,7 +223,7 @@ Requires: (php-composer(paragonie/random_compat) >= 2.0 with php Requires: (php-composer(monolog/monolog) >= 1.23 with php-composer(monolog/monolog) < 2) Requires: (php-composer(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 2) Requires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4) -Requires: (php-composer(leafo/scssphp) >= 0.7 with php-composer(leafo/scssphp) < 1) +Requires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) # remirepo:35 %else Requires: php-composer(iamcal/lib_autolink) < 2 @@ -257,7 +258,7 @@ Requires: php-composer(elvanto/litemoji) < 2 Requires: php-composer(elvanto/litemoji) >= 1.4 Requires: php-symfon3-console >= 3.4 Requires: php-composer(leafo/scssphp) < 1 -Requires: php-composer(leafo/scssphp) >= 0.7 +Requires: php-composer(leafo/scssphp) >= 0.7.7 %endif Requires: gnu-free-sans-fonts Provides: bundled(js-chartist-js) = 0.10.1 @@ -291,6 +292,7 @@ Requires: crontabs %if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: php-pecl-apcu Recommends: php-opcache +Recommends: php-selinux %endif # see https://github.com/glpi-project/glpi/issues/4837 @@ -609,9 +611,11 @@ fi * Fri Dec 21 2018 Remi Collet - 9.4.0~RC1-1 - update to 9.4.0 RC1 - add dependency on symfony/console 3.4 -- add dependency on leafo/scssphp 0.7 +- add dependency on leafo/scssphp 0.7.7 - add build dependency on mikey179/vfsStream 1.6 - drop dependency on fontawesome-fonts +- temporarily disable test suite +- add weak dependency on selinux extension * Tue Nov 27 2018 Remi Collet - 9.3.3-1 - update to 9.3.3 -- cgit