summaryrefslogtreecommitdiffstats
path: root/glpi.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-16 15:58:06 +0100
committerRemi Collet <remi@remirepo.net>2017-11-16 15:58:06 +0100
commite35ee70e457faa44021b9ca270ba52c564744d2e (patch)
tree8361118d9ed1c423bcf7b198e5b521631de0253d /glpi.spec
parent46a4d7ed34b4c3b64f341b00809d293a495e33a4 (diff)
v9.2.1
Diffstat (limited to 'glpi.spec')
-rw-r--r--glpi.spec15
1 files changed, 7 insertions, 8 deletions
diff --git a/glpi.spec b/glpi.spec
index 1f35627..10be8f3 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit 43bade1249719184b83a197fb57167676f68aae5
+%global gh_commit 3a7c5969c0534d0b5bf27fef9c4d96f56147ae66
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
@@ -42,8 +42,8 @@
%endif
Name: %{gh_project}
-Version: 9.2
-Release: 4%{?dist}
+Version: 9.2.1
+Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -62,8 +62,6 @@ Source5: %{name}-fedora-autoloader.php
# Temporary minify script, waiting for consolidation/robo
Source6: %{name}-minify.php
-# Upstream to use local_define.php and inc/downstream.php
-Patch0: https://github.com/glpi-project/glpi/commit/457e348266100a8d43720b614e898552d1fe24e5.patch
# RPM patch to use /etc/glpi/local_define.php
Patch1: glpi-localdef.patch
@@ -218,7 +216,6 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
-%patch0 -p1
%patch1 -p1
grep %{version} inc/define.php
@@ -405,9 +402,8 @@ cp %{SOURCE12} inc/downstream.php
: Run upstream test suite
php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1
-#atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/database || RET=1
atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/units || RET=1
-atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/api || RET=1
+atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/web || RET=1
: Cleanup
if [ -s $MYSQL_PID_FILE ]; then
@@ -502,6 +498,9 @@ fi
%changelog
+* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 9.2.1-1
+- update to 9.2.1
+
* Wed Oct 11 2017 Remi Collet <remi@remirepo.net> - 9.2-4
- move config/config_path.php to inc/downstream.php
- use /etc/glpi/local_define.php to allow local path change