diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-19 16:08:59 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-07-19 16:08:59 +0200 |
| commit | aecc473a0783289a2424843df8d2fac26145ab44 (patch) | |
| tree | d1dd08e3a2ec6bff4ac4d9bd967d762da9b7eb87 /glpi.spec | |
| parent | f4dd8cae6b07d186eed1fbd80f1ee8d73944bf2b (diff) | |
- allow elvanto/litemoji 2.0v9.3
see https://github.com/glpi-project/glpi/pull/6141
and https://github.com/glpi-project/glpi/pull/6147
Diffstat (limited to 'glpi.spec')
| -rw-r--r-- | glpi.spec | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -55,7 +55,7 @@ Name: %{gh_project} %global upstream_version 9.3.4 #global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -105,7 +105,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) # 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) @@ -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 # requires-dev BuildRequires: php-composer(guzzlehttp/guzzle) < 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) # remirepo:32 %else Requires: php-composer(iamcal/lib_autolink) < 2 @@ -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 %endif Requires: gnu-free-sans-fonts @@ -600,6 +600,11 @@ fi %changelog +* Fri Jul 19 2019 Remi Collet <remi@remirepo.net> - 9.3.4-3 +- allow elvanto/litemoji 2.0 + see https://github.com/glpi-project/glpi/pull/6141 + and https://github.com/glpi-project/glpi/pull/6147 + * Fri Jun 21 2019 Remi Collet <remi@remirepo.net> - 9.3.4-2 - [security] Prevent execution of XSS on rich text - [security] Prevent XSS attack on user picture |