From 4747702ba0de2039661363d8b053f26aaa65e4ac Mon Sep 17 00:00:00 2001 From: remi Date: Nov 30 2011 16:27:40 +0000 Subject: update to 0.80.5 --- diff --git a/.gitignore b/.gitignore index 73e8ba7..86a82d3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ glpi-0.72.4-11497.tar.gz /glpi-0.78.5.tar.gz /glpi-0.78-14966.tar.gz +/glpi-0.80.5.tar.gz diff --git a/glpi-cron.patch b/glpi-cron.patch index 80c2136..f7d62c4 100644 --- a/glpi-cron.patch +++ b/glpi-cron.patch @@ -1,24 +1,35 @@ -diff -up install/update_0723_078.php.cron install/update_0723_078.php ---- install/update_0723_078.php.cron 2010-06-15 19:21:06.749549193 +0200 -+++ install/update_0723_078.php 2010-06-15 19:23:32.651892513 +0200 -@@ -2097,6 +2097,9 @@ function update0723to078($output='HTML') - ('Ticket','alertnotclosed','43200',NULL,'1','1','3','0','24','30',NULL,NULL,NULL)"; - $DB->query($query) or die("0.78 populate glpi_crontasks" . $LANG['update'][90] . $DB->error()); - +diff -ru glpi.cron/install/install.php glpi/install/install.php +--- glpi.cron/install/install.php 2011-07-21 20:50:28.000000000 +0200 ++++ glpi/install/install.php 2011-08-22 19:17:20.468262531 +0200 +@@ -357,6 +357,15 @@ + $query = "UPDATE `glpi_users` + SET `language` = NULL"; + $DB->query($query) or die("4203 ".$LANG['update'][90].$DB->error()); ++ + // RPM provides a good system cron + $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `mode`=1"; -+ $DB->query($query) or die("0.78 update glpi_crontasks (for RPM)" . $LANG['update'][90] . $DB->error()); ++ $DB->query($query) ++ or die("RPM update of glpi_crontasks. " . $LANG['update'][90] . $DB->error()); ++ ++ $query = "UPDATE `glpi_configs` SET `cron_limit` = '3'"; ++ $DB->query($query) ++ or die("RPM update of glpi_configs. " . $LANG['update'][90] . $DB->error()); } - $ADDTODISPLAYPREF['Crontask']=array(8,3,4,7); ---- install/mysql/glpi-0.78.2-empty.sql.cron 2010-11-15 18:57:02.766598708 +0100 -+++ install/mysql/glpi-0.78.2-empty.sql 2010-11-15 18:57:44.406719150 +0100 -@@ -910,6 +910,8 @@ - INSERT INTO `glpi_crontasks` VALUES ('14','ReservationItem','reservation','3600',NULL,'1','1','3','0','24','30',NULL,NULL,NULL); - INSERT INTO `glpi_crontasks` VALUES ('15','Ticket','closeticket','43200',NULL,'1','1','3','0','24','30',NULL,NULL,NULL); - INSERT INTO `glpi_crontasks` VALUES ('16','Ticket','alertnotclosed','43200',NULL,'1','1','3','0','24','30',NULL,NULL,NULL); -+### RPM provides a good system cron -+UPDATE `glpi_crontasks` SET `mode`=2 WHERE `mode`=1; - ### Dump table glpi_devicecases +diff -ru glpi.cron/install/update.php glpi/install/update.php +--- glpi.cron/install/update.php 2011-07-21 20:50:28.000000000 +0200 ++++ glpi/install/update.php 2011-08-22 19:18:48.485449461 +0200 +@@ -762,6 +762,11 @@ + $plugin = new Plugin(); + $plugin->unactivateAll(); + ++ // RPM provides a good system cron ++ $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `mode`=1"; ++ $DB->query($query) ++ or die("RPM update of glpi_crontasks. " . $LANG['update'][90] . $DB->error()); ++ + echo "

".$LANG['update'][139]."

"; + optimize_tables($migration); +Seulement dans glpi/install/: update.php~ diff --git a/glpi.spec b/glpi.spec index 09dc8d0..83cc7a1 100644 --- a/glpi.spec +++ b/glpi.spec @@ -4,12 +4,12 @@ %global useselinux 0 %endif -%global svnrelease 14966 +#global svnrelease 12930 Name: glpi -Version: 0.78.5 +Version: 0.80.5 %if 0%{?svnrelease} -Release: 3.svn%{svnrelease}%{?dist} +Release: 2.svn%{svnrelease}%{?dist} %else Release: 1%{?dist} %endif @@ -24,7 +24,7 @@ URL: http://www.glpi-project.org/ Source0: glpi-0.78-%{svnrelease}.tar.gz Source99: mktar.sh %else -Source0: https://forge.indepnet.net/attachments/download/850/glpi-0.78.5.tar.gz +Source0: https://forge.indepnet.net/attachments/download/995/glpi-0.80.5.tar.gz %endif Source1: glpi-httpd.conf @@ -38,24 +38,25 @@ Patch0: glpi-cron.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php >= 5.0.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json +Requires: php >= 5.1.0, php-mysql, httpd, php-gd, php-ldap, php-imap, php-mbstring, php-xml, php-json Requires: php-pear(Cache_Lite) >= 1.7.4 Requires: php-PHPMailer -Requires: php-pear-CAS >= 1.1.0 +Requires: php-pear-CAS >= 1.2.0 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 Requires: php-pear(components.ez.no/Graph) >= 1.5 Requires: gnu-free-sans-fonts %else Requires: freefont %endif -Requires: %{_sysconfdir}/logrotate.d +Requires: %{_sysconfdir}/logrotate.d Requires(postun): /sbin/service -Requires(post): /sbin/service -BuildRequires: dos2unix +Requires(post): /sbin/service %if %{useselinux} -Requires: policycoreutils +Requires(post): /sbin/restorecon +Requires(post): /usr/sbin/semanage +Requires(postun): /usr/sbin/semanage %endif -Requires: %{_sysconfdir}/cron.d +Requires: %{_sysconfdir}/cron.d %description @@ -80,8 +81,8 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n glpi -%patch0 -find install -name \*.orig -exec rm {} \; -print +%patch0 -p1 +find . -name \*.orig -exec rm {} \; -print # Use system lib rm -rf lib/cache_lite @@ -103,7 +104,7 @@ mv lib/extjs/gpl-3.0.txt LICENSE.extjs mv lib/icalcreator/lgpl.txt LICENSE.icalcreator rm scripts/glpi_cron_*.sh -dos2unix -o LICENSE.tiny_mce +sed -i -e 's/\r//' LICENSE.tiny_mce for fic in LISEZMOI.txt README.txt do iconv -f ISO-8859-15 -t UTF-8 $fic >a && mv a $fic @@ -112,7 +113,7 @@ done cat >cron < - 0.80.5-1 +- version 0.80.5 released (bugfix) + 0.80.5 https://forge.indepnet.net/projects/glpi/versions/643 + 0.80.4 https://forge.indepnet.net/projects/glpi/versions/632 + 0.80.3 https://forge.indepnet.net/projects/glpi/versions/621 + 0.80.2 https://forge.indepnet.net/projects/glpi/versions/605 + 0.80.1 https://forge.indepnet.net/projects/glpi/versions/575 + 0.80 https://forge.indepnet.net/projects/glpi/versions/466 +- increase cron run frequency (3 tasks each 3 minutes) + * Sun Jul 24 2011 Remi Collet - 0.78.5-3.svn14966 - use system EZC only if available (not in EL-5) diff --git a/sources b/sources index e3f4e2a..a752f3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9706b8a4e7f03bf0c5023a19bfb3bf1d glpi-0.78-14966.tar.gz +acf6d03d9a364f2387d7853c061b00f2 glpi-0.80.5.tar.gz