rpms/glpi-mass-ocs-import/EL-4 glpi-rev7301.patch, NONE, 1.1 glpi-mass-ocs-import.spec, 1.2, 1.3

[Remi Collet]

Author: remi

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

Modified Files:
	glpi-mass-ocs-import.spec 
Added Files:
	glpi-rev7301.patch 
Log Message:
mysql 4.1 fix

glpi-rev7301.patch:

--- NEW FILE glpi-rev7301.patch ---
Index: scripts/ocsng_fullsync.php
===================================================================
--- scripts/ocsng_fullsync.php	(révision 7200)
+++ scripts/ocsng_fullsync.php	(copie de travail)
@@ -268,7 +268,7 @@
 		
 	$query_ocs = "SELECT ID FROM hardware INNER JOIN accountinfo ON (hardware.ID = accountinfo.HARDWARE_ID) "
 		." WHERE ((CHECKSUM&".intval($cfg_ocs["checksum"]).")>0 OR LASTDATE > '".$server->fields["max_glpi_date"]."') "
-		." AND LASTDATE < TIMESTAMPADD(MINUTE,-3,now())"
+		." AND TIMESTAMP(LASTDATE) < (NOW()-180)"
 		." AND ID<=".intval($server->fields["max_ocs_id"])." $where_multi_thread $where_limit";
 
 	if (!empty ($cfg_ocs["tag_limit"])) {


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/EL-4/glpi-mass-ocs-import.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpi-mass-ocs-import.spec	15 Sep 2008 18:40:02 -0000	1.2
+++ glpi-mass-ocs-import.spec	28 Sep 2008 17:50:17 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           glpi-mass-ocs-import
 Version:        1.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -14,6 +14,9 @@
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
 Source1:        %{name}.conf
 
+# MySQL 4.1 bug https://dev.indepnet.net/glpi/ticket/1148
+Patch0:         glpi-rev7301.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -36,6 +39,10 @@
 %prep
 %setup -q -c 
 
+cd %{pluginname}
+%patch0 -p0
+cd ..
+
 cat >README.fedora <<EOF
 
 Remember to Install this extension in the Application.
@@ -111,6 +118,9 @@
 
 
 %changelog
+* Sun Sep 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1.el4.1
+- Fix MySQL 4.1 compatibility issue
+
 * Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
 - update to 1.2 for glpi 0.71