From e12fb4b8b2803986c03b38edcc08b69798e2877f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: May 04 2015 07:36:57 +0000
Subject: update to 0.85.4 https://forge.indepnet.net/versions/1136


---

diff --git a/.gitignore b/.gitignore
index 379411a..92c4d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ glpi-0.72.4-11497.tar.gz
 /glpi-0.85.1.tar.gz
 /glpi-0.85.2.tar.gz
 /glpi-0.85.3.tar.gz
+/glpi-0.85.4.tar.gz
diff --git a/glpi-0.85-config_path.php b/glpi-0.85-config_path.php
index bc97248..1085cf1 100644
--- a/glpi-0.85-config_path.php
+++ b/glpi-0.85-config_path.php
@@ -11,12 +11,12 @@ define('GLPI_CACHE_DIR',      '/var/lib/glpi/files/_cache/');
 define('GLPI_CRON_DIR',       '/var/lib/glpi/files/_cron');
 define('GLPI_SESSION_DIR',    '/var/lib/glpi/files/_sessions');
 define('GLPI_PLUGIN_DOC_DIR', '/var/lib/glpi/files/_plugins');
-define('GLPI_LOCK_DIR',       '/var/lib/glpi/files/_lock/');
-define('GLPI_GRAPH_DIR',      '/var/lib/glpi/files/_graphs/');
-define('GLPI_TMP_DIR',        '/var/lib/glpi/files/_tmp/');
-define('GLPI_RSS_DIR',        '/var/lib/glpi/files/_rss/');
-define('GLPI_UPLOAD_DIR',     '/var/lib/glpi/files/_uploads/');
-define('GLPI_PICTURE_DIR',    '/var/lib/glpi/files/_pictures/');
+define('GLPI_LOCK_DIR',       '/var/lib/glpi/files/_lock');
+define('GLPI_GRAPH_DIR',      '/var/lib/glpi/files/_graphs');
+define('GLPI_TMP_DIR',        '/var/lib/glpi/files/_tmp');
+define('GLPI_RSS_DIR',        '/var/lib/glpi/files/_rss');
+define('GLPI_UPLOAD_DIR',     '/var/lib/glpi/files/_uploads');
+define('GLPI_PICTURE_DIR',    '/var/lib/glpi/files/_pictures');
 
 // Log
 define('GLPI_LOG_DIR',        '/var/log/glpi');
diff --git a/glpi.spec b/glpi.spec
index 5423965..803641d 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -27,7 +27,7 @@
 %endif
 
 Name:           glpi
-Version:        0.85.3
+Version:        0.85.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -35,7 +35,7 @@ Summary(fr):    Gestion Libre de Parc Informatique
 Group:          Applications/Internet
 License:        GPLv2+ and GPLv3+
 URL:            http://www.glpi-project.org/
-Source0:        https://forge.indepnet.net/attachments/download/2006/glpi-0.85.3.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/2020/glpi-0.85.4.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-0.85-config_path.php
@@ -225,9 +225,9 @@ done >%{name}.lang
 (
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_rw_content_t -r s0 "%{_sysconfdir}/%{name}(/.*)?"
+semanage fcontext -a -s system_u -t httpd_var_lib_t        -r s0 "%{_localstatedir}/lib/%{name}(/.*)?"
 semanage fcontext -a -s system_u -t httpd_sys_content_t    -r s0 "%{_datadir}/%{name}(/.*)?"
 semanage fcontext -a -s system_u -t httpd_log_t            -r s0 "%{_localstatedir}/log/%{name}(/.*)?"
-semanage fcontext -a -s system_u -t httpd_var_lib_t        -r s0 "%{_localstatedir}/lib/%{name}(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/%{name}
 restorecon -R %{_datadir}/%{name}
@@ -289,6 +289,10 @@ fi
 
 
 %changelog
+* Mon May  4 2015 Remi Collet <remi@fedoraproject.org> - 0.85.4-1
+- update to 0.85.4
+  https://forge.indepnet.net/versions/1136
+
 * Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 0.85.3-1
 - update to 0.85.3
   https://forge.indepnet.net/versions/1118
diff --git a/sources b/sources
index 5ac1566..6859c7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c6ed629047e1eeb217b04fcb196101a  glpi-0.85.3.tar.gz
+3020006ca1cb90a19b130eee11311e61  glpi-0.85.4.tar.gz