diff --git a/glpi-rev7340.patch b/glpi-rev7340.patch deleted file mode 100644 index bc29dbd..0000000 --- a/glpi-rev7340.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 482b933..f5fa6f0 100644 --- a/glpi.spec +++ b/glpi.spec @@ -5,8 +5,8 @@ %endif Name: glpi -Version: 0.71.2 -Release: 1%{?dist}.1 +Version: 0.71.3 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -20,11 +20,9 @@ Source2: glpi-config_path.php Source3: glpi-logrotate # Avoid SELinux AVC when testing write access to log file. +# backport from 0.72 (Changeset 7208) 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 @@ -69,7 +67,6 @@ techniciens grâce à une maintenance plus cohérente. %setup -q -n glpi %patch0 -p0 -%patch1 -p0 %if 0%{?rhel} == 4 @@ -84,6 +81,7 @@ rm -rf lib/cache_lite cp %{SOURCE2} config/config_path.php %endif + mv lib/phpmailer/LICENSE LICENSE.phpmailer mv lib/tiny_mce/license.txt LICENSE.tiny_mce dos2unix -o LICENSE.phpmailer LICENSE.tiny_mce @@ -232,6 +230,9 @@ fi %changelog +* Sun Nov 30 2008 Remi Collet - 0.71.3-1 +- update to 0.71.3 (bugfix release) + * Sun Sep 28 2008 Remi Collet - 0.71.2-1.el4.1 - Fix MySQL 4.1 compatibility issue diff --git a/sources b/sources index cd34b64..98d0e6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -404265b0efa8300a0f303665ff2c741b glpi-0.71.2.tar.gz +0ad7e379f69cc81c59d5b297ab83474a glpi-0.71.3.tar.gz