[glpi] update to 0.80.6 (bugfix)

[Remi Collet]

commit d9ecb0e5a5e896e89dddfb28e3d90a96035a14bf
Author: remi <fedora at famillecollet.com>
Date:   Thu Jan 5 17:40:29 2012 +0100

    update to 0.80.6 (bugfix)

 .gitignore            |    1 +
 changeset_r16804.diff |   18 ++++++++++++++++++
 glpi.spec             |   12 ++++++++++--
 sources               |    2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86a82d3..bc8c1da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,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
+/glpi-0.80.6.tar.gz
diff --git a/changeset_r16804.diff b/changeset_r16804.diff
new file mode 100644
index 0000000..0f589b5
--- /dev/null
+++ b/changeset_r16804.diff
@@ -0,0 +1,18 @@
+Index: branches/0.80-bugfixes/inc/document.class.php
+===================================================================
+--- branches/0.80-bugfixes/inc/document.class.php	(revision 16803)
++++ branches/0.80-bugfixes/inc/document.class.php	(revision 16804)
+@@ -1206,10 +1206,10 @@
+          $linkparam = "&amp;tickets_id=".$item->fields['id'];
+       }
+ 
+-      if ($item->getType() == 'Ticket' && $item->getField('status') != 'closed') {
++      if ($item->getType() == 'Ticket' && $item->getField('status') == 'closed') {
++         $canedit = false;
++      } else {
+          $canedit = $item->can($ID,'w');
+-      } else {
+-         $canedit = false;
+       }
+ 
+       $is_recursive=$item->isRecursive();
diff --git a/glpi.spec b/glpi.spec
index 83cc7a1..9d37d9a 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
 #global svnrelease 12930
 
 Name:           glpi
-Version:        0.80.5
+Version:        0.80.6
 %if 0%{?svnrelease}
 Release:        2.svn%{svnrelease}%{?dist}
 %else
@@ -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/995/glpi-0.80.5.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1034/glpi-0.80.6.tar.gz
 %endif
 
 Source1:        glpi-httpd.conf
@@ -34,6 +34,8 @@ Source3:        glpi-logrotate
 # Switch all internal cron tasks to system
 Patch0:         glpi-cron.patch
 
+# https://forge.indepnet.net/issues/3299
+Patch1:         changeset_r16804.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -82,6 +84,7 @@ techniciens grâce à une maintenance plus cohérente.
 %setup -q -n glpi
 
 %patch0 -p1
+%patch1 -p2
 find . -name \*.orig -exec rm {} \; -print
 
 # Use system lib
@@ -248,6 +251,11 @@ fi
 
 
 %changelog
+* Thu Jan 05 2012 Remi Collet <remi at fedoraproject.org> - 0.80.6-1
+- version 0.80.6 released (bugfix)
+  https://forge.indepnet.net/projects/glpi/versions/657
+- add patch for https://forge.indepnet.net/issues/3299
+
 * Wed Nov 30 2011 Remi Collet <remi at fedoraproject.org> - 0.80.5-1
 - version 0.80.5 released (bugfix)
   0.80.5 https://forge.indepnet.net/projects/glpi/versions/643
diff --git a/sources b/sources
index a752f3b..f71ffb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acf6d03d9a364f2387d7853c061b00f2  glpi-0.80.5.tar.gz
+e7b30264d5b897b6a2100b375da64d24  glpi-0.80.6.tar.gz