From 8c43b2f63f55f761a3684035f02ce875f64eda0b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Jul 2019 16:13:09 +0200 Subject: - allow elvanto/litemoji 2.0 see https://github.com/glpi-project/glpi/pull/6141 and https://github.com/glpi-project/glpi/pull/6147 --- glpi.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/glpi.spec b/glpi.spec index 3a3fb45..3640125 100644 --- a/glpi.spec +++ b/glpi.spec @@ -55,7 +55,7 @@ Name: %{gh_project} %global upstream_version 9.4.3 #global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -104,7 +104,7 @@ BuildRequires: (php-composer(michelf/php-markdown) >= 1.6 with php BuildRequires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) BuildRequires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3) 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(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 3) BuildRequires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4) BuildRequires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) # requires-dev @@ -139,7 +139,7 @@ BuildRequires: php-composer(paragonie/random_compat) < 3 BuildRequires: php-composer(paragonie/random_compat) >= 2.0 BuildRequires: php-composer(monolog/monolog) < 2 BuildRequires: php-composer(monolog/monolog) >= 1.23 -BuildRequires: php-composer(elvanto/litemoji) < 2 +BuildRequires: php-composer(elvanto/litemoji) < 3 BuildRequires: php-composer(elvanto/litemoji) >= 1.4 BuildRequires: php-composer(leafo/scssphp) < 1 BuildRequires: php-composer(leafo/scssphp) >= 0.7.7 @@ -213,7 +213,7 @@ Requires: (php-composer(michelf/php-markdown) >= 1.6 with php Requires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) Requires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3) 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(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 3) Requires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4) Requires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) # remirepo:33 @@ -244,7 +244,7 @@ Requires: php-composer(paragonie/random_compat) < 3 Requires: php-composer(paragonie/random_compat) >= 2.0 Requires: php-composer(monolog/monolog) < 2 Requires: php-composer(monolog/monolog) >= 1.23 -Requires: php-composer(elvanto/litemoji) < 2 +Requires: php-composer(elvanto/litemoji) < 3 Requires: php-composer(elvanto/litemoji) >= 1.4 Requires: php-symfony3-console >= 3.4 Requires: php-composer(leafo/scssphp) < 1 @@ -610,6 +610,11 @@ fi %changelog +* Fri Jul 19 2019 Remi Collet - 9.4.3-2 +- allow elvanto/litemoji 2.0 + see https://github.com/glpi-project/glpi/pull/6141 + and https://github.com/glpi-project/glpi/pull/6147 + * Thu Jun 20 2019 Remi Collet - 9.4.3-1 - update to 9.4.3 -- cgit