rpms/glpi/EL-4 glpi-rev7340.patch,NONE,1.1 glpi.spec,1.6,1.7

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25460

Modified Files:
	glpi.spec 
Added Files:
	glpi-rev7340.patch 
Log Message:
mysql 4.1 fix

glpi-rev7340.patch:

--- NEW FILE glpi-rev7340.patch ---
Index: inc/ocsng.function.php
===================================================================
--- inc/ocsng.function.php	(révision 7334)
+++ inc/ocsng.function.php	(copie de travail)
@@ -1249,7 +1249,7 @@
 			
 		// workaround to avoid duplicate when synchro occurs during an inventory 
 		// "after" insert in ocsweb.hardware  and "before" insert in ocsweb.deleted_equiv 
-		$query_ocs .= " AND LASTDATE < TIMESTAMPADD(MINUTE,-3,now()) ";
+		$query_ocs .= " AND TIMESTAMP(LASTDATE) < (NOW()-180) ";
 		
 		
 		if (!empty ($cfg_ocs["tag_limit"])) {


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glpi.spec	15 Sep 2008 18:26:53 -0000	1.6
+++ glpi.spec	28 Sep 2008 17:46:43 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.71.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -22,6 +22,9 @@
 # Avoid SELinux AVC when testing write access to log file.
 Patch0:         glpi-check.patch
 
+# MySQL 4.1 bug https://dev.indepnet.net/glpi/ticket/1148
+Patch1:         glpi-rev7340.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,6 +69,7 @@
 %setup -q -n glpi
 
 %patch0 -p0
+%patch1 -p0
 
 %if 0%{?rhel} == 4
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1.el4.1
+- Fix MySQL 4.1 compatibility issue
+
 * Mon Sep 15 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.2-1
 - update to 0.71.2 bugfix