summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glpi.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/glpi.spec b/glpi.spec
index 03a346b..f727517 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -1,6 +1,6 @@
# Fedora/remirepo spec file for glpi
#
-# Copyright (c) 2007-2018 Remi Collet
+# Copyright (c) 2007-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -35,8 +35,7 @@
%endif
# remirepo:5
-#if 0%%{?fedora} < 19 && 0%%{?rhel} < 8
-%if 1
+%if 0%{?fedora} < 19 && 0%{?rhel} < 8
# MySQL need another bootstrap method
# GLPI requires MySQL >= 5.6 or MariaDB >= 10
%global with_tests 0%{?_with_tests:1}
@@ -56,7 +55,7 @@ Name: %{gh_project}
%global upstream_version 9.4.0
%global upstream_prever RC1
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
@@ -78,6 +77,8 @@ Source7: %{name}-user.ini
# allow to install in /usr/bin
Patch0: %{name}-bin.patch
+# for tests
+Patch1: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/5200.patch
BuildArch: noarch
BuildRequires: gettext
@@ -321,6 +322,7 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
%patch0 -p1 -b .rpm
+%patch1 -p1 -b .pr5200
grep %{upstream_version} inc/define.php
@@ -608,6 +610,10 @@ fi
%changelog
+* Fri Jan 4 2019 Remi Collet <remi@remirepo.net> - 9.4.0~RC1-3
+- open https://github.com/glpi-project/glpi/pull/5200 fix tests
+- re-enable test suite
+
* Fri Dec 21 2018 Remi Collet <remi@remirepo.net> - 9.4.0~RC1-2
- fix typo in dependency name