From e42ffe560f69c604c96e8b9bd254019cbd957240 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 14 Jun 2018 14:03:56 +0200
Subject: test build for pr #4178

---
 4178.patch                    | 24 ++++++++++++++++++++++++
 glpi-9.2-config_path.php      | 33 ---------------------------------
 glpi-9.2-config_path_test.php | 14 --------------
 glpi-downstream-test.php      | 14 ++++++++++++++
 glpi-downstream.php           | 37 +++++++++++++++++++++++++++++++++++++
 glpi.spec                     | 12 +++++++++---
 6 files changed, 84 insertions(+), 50 deletions(-)
 create mode 100644 4178.patch
 delete mode 100644 glpi-9.2-config_path.php
 delete mode 100644 glpi-9.2-config_path_test.php
 create mode 100644 glpi-downstream-test.php
 create mode 100644 glpi-downstream.php

diff --git a/4178.patch b/4178.patch
new file mode 100644
index 0000000..c860520
--- /dev/null
+++ b/4178.patch
@@ -0,0 +1,24 @@
+From f4c6a0e0688cfb95afb695f0b26179df3e617e8d Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 14 Jun 2018 14:02:13 +0200
+Subject: [PATCH] cleanup RPM stuff (moved to downstream.php)
+
+---
+ inc/based_config.php | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/inc/based_config.php b/inc/based_config.php
+index da03ab70c0..834d4ea4ef 100644
+--- a/inc/based_config.php
++++ b/inc/based_config.php
+@@ -43,9 +43,7 @@
+ }
+ 
+ // If this file exists, it is load
+-if (!is_dir(GLPI_ROOT. '/config') && file_exists('/etc/glpi/local_define.php')) { // Relocated (Linux only)
+-   require_once '/etc/glpi/local_define.php';
+-} else if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
++if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
+    require_once GLPI_ROOT. '/config/local_define.php';
+ }
+ 
diff --git a/glpi-9.2-config_path.php b/glpi-9.2-config_path.php
deleted file mode 100644
index b7a1a7e..0000000
--- a/glpi-9.2-config_path.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Red Hat / Fedora RPM default configuration
- *
- * Modifying this file in-place is not recommended, because
- * changes will be overwritten during package upgrades.
- *
- * If you want to customize the behaviour, the best way is to
- * create and use the /etc/glpi/local_define.php file.
- *
-**/
-
-
-// Config
-define('GLPI_CONFIG_DIR',     '/etc/glpi');
-
-// Runtime Data
-defined('GLPI_VAR_DIR')        or define('GLPI_VAR_DIR',        '/var/lib/glpi/files');
-
-// Log
-defined('GLPI_LOG_DIR')        or define('GLPI_LOG_DIR',        '/var/log/glpi');
-
-// System libraries
-define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
-
-// Fonts
-define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
-
-// Use system cron
-define('GLPI_SYSTEM_CRON', true);
-
-// Packaging
-define('GLPI_INSTALL_MODE', 'RPM');
diff --git a/glpi-9.2-config_path_test.php b/glpi-9.2-config_path_test.php
deleted file mode 100644
index f159a57..0000000
--- a/glpi-9.2-config_path_test.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// for Redhat/Fedora RPM buiding test suite
-
-// Runtime Data
-define('GLPI_VAR_DIR',        __DIR__ . '/../files');
-
-// System libraries
-define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
-
-// Fonts
-define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
-
-//Use system cron
-define('GLPI_SYSTEM_CRON', true);
diff --git a/glpi-downstream-test.php b/glpi-downstream-test.php
new file mode 100644
index 0000000..f159a57
--- /dev/null
+++ b/glpi-downstream-test.php
@@ -0,0 +1,14 @@
+<?php
+// for Redhat/Fedora RPM buiding test suite
+
+// Runtime Data
+define('GLPI_VAR_DIR',        __DIR__ . '/../files');
+
+// System libraries
+define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
+
+// Fonts
+define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
+
+//Use system cron
+define('GLPI_SYSTEM_CRON', true);
diff --git a/glpi-downstream.php b/glpi-downstream.php
new file mode 100644
index 0000000..3be9964
--- /dev/null
+++ b/glpi-downstream.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * RPM default configuration
+ *
+ * Modifying this file in-place is not recommended, because
+ * changes will be overwritten during package upgrades.
+ *
+ * If you want to customize the behaviour, the best way is to
+ * create and use the /etc/glpi/local_define.php file.
+ *
+**/
+
+
+// Config
+define('GLPI_CONFIG_DIR',     '/etc/glpi');
+
+if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) {
+   require_once GLPI_CONFIG_DIR . '/local_define.php';
+}
+
+// Runtime Data
+defined('GLPI_VAR_DIR')        or define('GLPI_VAR_DIR',        '/var/lib/glpi/files');
+
+// Log
+defined('GLPI_LOG_DIR')        or define('GLPI_LOG_DIR',        '/var/log/glpi');
+
+// System libraries
+define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
+
+// Fonts
+define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
+
+// Use system cron
+define('GLPI_SYSTEM_CRON', true);
+
+// Packaging
+define('GLPI_INSTALL_MODE', 'RPM');
diff --git a/glpi.spec b/glpi.spec
index 4947ec6..2216f7e 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -44,7 +44,7 @@ Name:           %{gh_project}
 %global upstream_prever  RC2
 # use 9.3.0~RC2 < 9.3 (for plugin compatibility check)
 Version:        %{upstream_version}.0%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -54,8 +54,8 @@ URL:            http://www.glpi-project.org/
 Source0:        https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}-%{gh_short}.tar.gz
 
 Source1:        %{name}-httpd.conf
-Source2:        %{name}-9.2-config_path.php
-Source12:       %{name}-9.2-config_path_test.php
+Source2:        %{name}-downstream.php
+Source12:       %{name}-downstream-test.php
 Source3:        %{name}-logrotate
 Source4:        %{name}-nginx.conf
 Source5:        %{name}-fedora-autoloader.php
@@ -64,6 +64,8 @@ Source6:        %{name}-minify.php
 # Override PHP configuration for php-fpm
 Source7:        %{name}-user.ini
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/4178.patch
+
 BuildArch:      noarch
 BuildRequires:  gettext
 BuildRequires:  php-cli
@@ -274,6 +276,7 @@ techniciens grâce à une maintenance plus cohérente.
 
 %prep
 %setup -q -n %{name}-%{gh_commit}
+%patch0 -p1
 
 grep %{upstream_version} inc/define.php
 
@@ -556,6 +559,9 @@ fi
 
 
 %changelog
+* Thu Jun 14 2018 Remi Collet <remi@remirepo.net> - 9.3.0~RC2-2
+- test build
+
 * Tue Jun 12 2018 Remi Collet <remi@remirepo.net> - 9.3.0~RC2-1
 - update to 9.3-RC2
 - drop dependency on jasig/phpcas
-- 
cgit