From f130d12a373db1ac519aa22904715643dd00b82b Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Jan 05 2012 21:20:17 +0000
Subject: update to 0.80.61 (fix regression)


---

diff --git a/.gitignore b/.gitignore
index bc8c1da..109bb3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ glpi-0.72.4-11497.tar.gz
 /glpi-0.78-14966.tar.gz
 /glpi-0.80.5.tar.gz
 /glpi-0.80.6.tar.gz
+/glpi-0.80.61.tar.gz
diff --git a/changeset_r16804.diff b/changeset_r16804.diff
deleted file mode 100644
index 0f589b5..0000000
--- a/changeset_r16804.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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 9d37d9a..187d582 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,8 @@
 #global svnrelease 12930
 
 Name:           glpi
-Version:        0.80.6
+# upstream is 0.80.61, use 0.80.6.1 to be < 0.80.7
+Version:        0.80.6.1
 %if 0%{?svnrelease}
 Release:        2.svn%{svnrelease}%{?dist}
 %else
@@ -24,7 +25,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/1034/glpi-0.80.6.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1037/glpi-0.80.61.tar.gz
 %endif
 
 Source1:        glpi-httpd.conf
@@ -34,8 +35,6 @@ 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
@@ -84,7 +83,6 @@ 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
@@ -251,6 +249,10 @@ fi
 
 
 %changelog
+* Thu Jan 05 2012 Remi Collet <remi@fedoraproject.org> - 0.80.6.1-1
+- version 0.80.61 released (bugfix)
+  https://forge.indepnet.net/projects/glpi/versions/677
+
 * Thu Jan 05 2012 Remi Collet <remi@fedoraproject.org> - 0.80.6-1
 - version 0.80.6 released (bugfix)
   https://forge.indepnet.net/projects/glpi/versions/657
diff --git a/sources b/sources
index f71ffb8..dec9a04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7b30264d5b897b6a2100b375da64d24  glpi-0.80.6.tar.gz
+843bfbc2c3c5ab10ec2926ee44c544a5  glpi-0.80.61.tar.gz