diff options
| -rw-r--r-- | f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch | 22 | ||||
| -rw-r--r-- | glpi-localdef.patch | 16 | ||||
| -rw-r--r-- | glpi.spec | 37 |
3 files changed, 17 insertions, 58 deletions
diff --git a/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch b/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch deleted file mode 100644 index 06b1117..0000000 --- a/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f18a6c947869f57c33d0f6f14029bcc9f4cede1f Mon Sep 17 00:00:00 2001 -From: Johan Cwiklinski <jcwiklinski@teclib.com> -Date: Wed, 6 Dec 2017 09:21:03 +0100 -Subject: [PATCH] Handle 9.1.7 and 9.1.7.1 releases - ---- - inc/update.class.php | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/inc/update.class.php b/inc/update.class.php -index 75c25f8860..615c6db80c 100644 ---- a/inc/update.class.php -+++ b/inc/update.class.php -@@ -389,6 +389,8 @@ public function doUpdates($current_version = null) { - case "9.1.4": - case "9.1.5": - case "9.1.6": -+ case "9.1.7": -+ case "9.1.7.1": - case "9.2-dev": - include_once("{$updir}update_91_92.php"); - update91to92(); diff --git a/glpi-localdef.patch b/glpi-localdef.patch deleted file mode 100644 index 7b7be8d..0000000 --- a/glpi-localdef.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up ./inc/based_config.php.rpm ./inc/based_config.php ---- ./inc/based_config.php.rpm 2017-10-11 09:59:42.446010854 +0200 -+++ ./inc/based_config.php 2017-10-11 10:11:47.457934585 +0200 -@@ -46,9 +46,9 @@ if (!empty($tz)) { - date_default_timezone_set(@date_default_timezone_get()); - } - --// If this file exists, it is load --if (file_exists(GLPI_ROOT. '/config/local_define.php')) { -- require_once GLPI_ROOT. '/config/local_define.php'; -+// If this file exists, it is load from etc (RPM specific) -+if (file_exists('/etc/glpi/local_define.php')) { -+ require_once '/etc/glpi/local_define.php'; - } - - // If this file exists, it is load, allow to set configdir/dumpdir elsewhere @@ -1,13 +1,13 @@ # Fedora/remirepo spec file for glpi # -# Copyright (c) 2007-2017 Remi Collet +# Copyright (c) 2007-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 3a7c5969c0534d0b5bf27fef9c4d96f56147ae66 +%global gh_commit aff731b59aaa4e0c07c802b6ca30074b46dbf501 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -21,7 +21,7 @@ %global useselinux 0 %endif -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 # nginx 1.6 with nginx-filesystem %global with_nginx 1 # httpd 2.4 with httpd-filesystem @@ -40,12 +40,11 @@ %endif Name: %{gh_project} -Version: 9.2.1 -Release: 6%{?dist} +Version: 9.2.2 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique -Group: Applications/Internet License: GPLv2+ and GPLv3+ and MIT URL: http://www.glpi-project.org/ # Upstream sources (not the github auto-generated archive) @@ -62,12 +61,6 @@ Source6: %{name}-minify.php # Override PHP configuration for php-fpm Source7: %{name}-user.ini -# RPM patch to use /etc/glpi/local_define.php -Patch1: glpi-localdef.patch - -# Upstream patch to allow update from 9.1.7.1 -Patch2: https://github.com/glpi-project/glpi/commit/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch - BuildArch: noarch BuildRequires: gettext %if %{with_tests} @@ -91,7 +84,7 @@ BuildRequires: php-composer(simplepie/simplepie) < 2 BuildRequires: php-composer(tecnickcom/tcpdf) < 7 BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.13 # remirepo:1 -%if 0%{?fedora} >= 25 +%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8 BuildRequires: php-autoloader(zendframework/zend-cache) < 3 BuildRequires: php-autoloader(zendframework/zend-cache) >= 2.7 BuildRequires: php-autoloader(zendframework/zend-i18n) < 3 @@ -174,7 +167,7 @@ Requires: php-composer(simplepie/simplepie) >= 1.5 Requires: php-composer(tecnickcom/tcpdf) < 7 Requires: php-composer(tecnickcom/tcpdf) >= 6.2.13 # remirepo:1 -%if 0%{?fedora} >= 25 +%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8 Requires: php-autoloader(zendframework/zend-cache) < 3 Requires: php-autoloader(zendframework/zend-cache) >= 2.7 Requires: php-autoloader(zendframework/zend-i18n) < 3 @@ -198,7 +191,7 @@ Requires: php-composer(true/punycode) >= 2.1 Requires: php-composer(paragonie/random_compat) < 3 Requires: php-composer(paragonie/random_compat) >= 2.0 Requires: gnu-free-sans-fonts -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Requires: fontawesome-fonts >= 4.7.0 %else Provides: bundled(fontawesome-fonts) = 4.7.0 @@ -222,7 +215,7 @@ Requires(post): /usr/sbin/semanage Requires(postun): /usr/sbin/semanage %endif Requires: crontabs -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: php-pecl-apcu Recommends: php-opcache %endif @@ -249,8 +242,6 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} -%patch1 -p1 -%patch2 -p1 grep %{version} inc/define.php @@ -262,7 +253,7 @@ find lib -name \*.swf -exec rm {} \; -print # Use system lib rm -r lib/htmlawed rm lib/FreeSans.ttf -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 rm lib/font-awesome-4.7.0/fonts/FontAwesome.otf rm lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf ln -s /usr/share/fonts/fontawesome/FontAwesome.otf lib/font-awesome-4.7.0/fonts/FontAwesome.otf @@ -437,7 +428,7 @@ done 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 +php scripts/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/units || RET=1 atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/web || RET=1 @@ -528,6 +519,12 @@ fi %changelog +* Thu Mar 1 2018 Remi Collet <remi@remirepo.net> - 9.2.2-1 +- update to 9.2.2 + +* Thu Mar 1 2018 Remi Collet <remi@remirepo.net> - 9.2.2-0 +- test build for upcomming 9.2.2 + * Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 9.2.1-6 - add upstream patch to allow upgrade from 9.1.7.1 |