diff options
Diffstat (limited to 'glpi.spec')
| -rw-r--r-- | glpi.spec | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,6 @@ # Fedora/remirepo spec file for glpi # -# Copyright (c) 2007-2019 Remi Collet +# Copyright (c) 2007-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -40,12 +40,7 @@ # GLPI requires MySQL >= 5.6 or MariaDB >= 10 %global with_tests 0%{?_with_tests:1} %else -%if 0%{?fedora} >= 32 -# atoum is not yet 7.4 compatible -%global with_tests 0%{?_with_tests:1} -%else %global with_tests 0%{!?_without_tests:1} -%endif # remirepo:1 %endif @@ -60,7 +55,7 @@ Name: %{gh_project} %global upstream_version 9.4.5 #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 @@ -82,6 +77,8 @@ Source7: %{name}-user.ini # allow to install in /usr/bin Patch0: %{name}-bin.patch +# Upstream patches +Patch1: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/6783.patch BuildArch: noarch BuildRequires: gettext @@ -325,6 +322,7 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 grep %{upstream_version} inc/define.php @@ -465,7 +463,7 @@ export GLPI_SKIP_ONLINE=1 : Running a PHP server export GLPI_URI=http://127.0.0.1:8089 -%{_bindir}/php -S 127.0.0.1:8089 tests/router.php &>web.log & +php -S 127.0.0.1:8089 tests/router.php &>web.log & PHPPID=$! : Running a MariaDB server @@ -615,6 +613,10 @@ fi %changelog +* Thu Jan 9 2020 Remi Collet <remi@remirepo.net> - 9.4.5-2 +- add upstream patches for PHP 7.4 +- re-enable test suite + * Wed Dec 18 2019 Remi Collet <remi@remirepo.net> - 9.4.5-1 - update to 9.4.5 - disable test suite with PHP 7.4 |