diff --git a/glpi-rev7340.patch b/glpi-rev7340.patch new file mode 100644 index 0000000..bc29dbd --- /dev/null +++ b/glpi-rev7340.patch @@ -0,0 +1,13 @@ +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"])) { diff --git a/glpi.spec b/glpi.spec index 2f04190..482b933 100644 --- a/glpi.spec +++ b/glpi.spec @@ -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 @@ Source3: glpi-logrotate # 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 @@ techniciens grâce à une maintenance plus cohérente. %setup -q -n glpi %patch0 -p0 +%patch1 -p0 %if 0%{?rhel} == 4 @@ -228,6 +232,9 @@ fi %changelog +* Sun Sep 28 2008 Remi Collet - 0.71.2-1.el4.1 +- Fix MySQL 4.1 compatibility issue + * Mon Sep 15 2008 Remi Collet - 0.71.2-1 - update to 0.71.2 bugfix