From 4a9a88d71ae468780dadc617838dbfea31bcc4e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Dec 2019 11:17:10 +0100 Subject: v9.4.5 --- glpi.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/glpi.spec b/glpi.spec index efe2295..8750342 100644 --- a/glpi.spec +++ b/glpi.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 9b9127cb21ce038a37b9201b986b8b55ed7ba461 +%global gh_commit b7f90388babf6b621dff121701b69f8d20124e77 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -40,7 +40,12 @@ # 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 @@ -52,7 +57,7 @@ %endif Name: %{gh_project} -%global upstream_version 9.4.4 +%global upstream_version 9.4.5 #global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} @@ -610,6 +615,10 @@ fi %changelog +* Wed Dec 18 2019 Remi Collet - 9.4.5-1 +- update to 9.4.5 +- disable test suite with PHP 7.4 + * Tue Sep 24 2019 Remi Collet - 9.4.4-1 - update to 9.4.4 -- cgit