From f45d2ffb8ef0dca962fc96ce6e3422b0816fad40 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 16 Sep 2015 11:12:59 +0200
Subject: GLPI 0.85.5

---
 glpi-0.85-config_path.php |  7 ++++---
 glpi-dev.spec             | 21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/glpi-0.85-config_path.php b/glpi-0.85-config_path.php
index f924707..eca3801 100644
--- a/glpi-0.85-config_path.php
+++ b/glpi-0.85-config_path.php
@@ -22,13 +22,14 @@ define('GLPI_PICTURE_DIR',    '/var/lib/glpi/files/_pictures');
 define('GLPI_LOG_DIR',        '/var/log/glpi');
 
 // System libraries
-define('GLPI_PHPMAILER_DIR',  'PHPMailer');
+define('GLPI_PHPMAILER_DIR',  '/usr/share/php/PHPMailer');
 define('GLPI_EZC_BASE',       '/usr/share/php/ezc/Base/base.php');
-define('GLPI_PHPCAS',         'CAS.php');
-define('GLPI_HTMLAWED',       'htmLawed/htmLawed.php');
+define('GLPI_PHPCAS',         '/usr/share/pear/CAS.php');
+define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
 define('GLPI_ZEND_PATH',      '/usr/share/php/Zend');
 define('GLPI_SIMPLEPIE_PATH', '/usr/share/php/php-simplepie');
 define('GLPI_TCPDF_DIR',      '/usr/share/php/tcpdf');
+define('GLPI_PASSWORD_COMPAT','/usr/share/php/password_compat/password.php');
 
 // Fonts
 define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
diff --git a/glpi-dev.spec b/glpi-dev.spec
index 796c941..f8465c5 100644
--- a/glpi-dev.spec
+++ b/glpi-dev.spec
@@ -1,4 +1,4 @@
-# spec file for glpi
+# Fedora/remirepo spec file for glpi
 #
 # Copyright (c) 2007-2015 Remi Collet
 # License: CC-BY-SA
@@ -27,15 +27,16 @@
 %endif
 
 Name:           glpi
-Version:        0.85.4
-Release:        2%{?dist}
+Version:        0.85.5
+Release:        1%{?dist}
 Summary:        Free IT asset management software
 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/2020/glpi-0.85.4.tar.gz
+# Upstream sources (not the github auto-generated archive)
+Source0:        https://github.com/glpi-project/%{name}/releases/download/%{version}/glpi-%{version}.tar.gz
 
 Source1:        glpi-httpd.conf
 Source2:        glpi-0.85-config_path.php
@@ -85,6 +86,7 @@ Requires:       php-ZendFramework2-Loader
 Requires:       php-ZendFramework2-ServiceManager
 Requires:       php-ZendFramework2-Stdlib
 Requires:       php-ZendFramework2-Version
+Requires:       php-composer(ircmaxell/password-compat)
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires:       php-composer(zetacomponents/graph)
 Requires:       gnu-free-sans-fonts
@@ -138,9 +140,13 @@ rm -rf lib/htmlawed
 rm -rf lib/Zend
 rm -rf lib/simplepie
 rm -rf lib/tcpdf
+rm -rf lib/password_compat
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-rm -rf lib/ezcomponents
+rm -rf lib/zeta
 %endif
+rm -rf lib/FreeSans.ttf
+: bundled JS libraries
+ls lib
 
 %if 0%{?fedora} < 9 && 0%{?rhel} < 6
 # fix font path on old version
@@ -314,6 +320,11 @@ fi
 
 
 %changelog
+* Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 0.85.5-1
+- update to 0.85.5
+  https://github.com/glpi-project/glpi/issues?q=milestone:0.85.5
+- use system ircmaxell/password-compat
+
 * Wed Jun  3 2015 Remi Collet <remi@fedoraproject.org> - 0.85.4-2
 - switch from eZ component to Zeta component
 
-- 
cgit