From fde505a9131211e2dd33eb8d87cf8b74f7506b52 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 17 Apr 2014 06:56:17 +0200
Subject: glpi-pdf: 0.84.1

---
 changeset_r361.diff | 20 --------------------
 glpi-pdf.spec       | 17 +++++++++--------
 2 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 changeset_r361.diff

diff --git a/changeset_r361.diff b/changeset_r361.diff
deleted file mode 100644
index b7380a2..0000000
--- a/changeset_r361.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: trunk/hook.php
-===================================================================
---- trunk/hook.php	(revision 360)
-+++ trunk/hook.php	(revision 361)
-@@ -122,7 +122,7 @@
-                   `use` tinyint(1) default 0,
-                   PRIMARY KEY (`id`)
-                ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
--      $DB->queryOrDir($query, $DB->error());
-+      $DB->queryOrDie($query, $DB->error());
-    } else {
-       if (FieldExists('glpi_plugin_pdf_profiles','ID')) { //< 0.7.0
-          $migration->changeField('glpi_plugin_pdf_profiles', 'ID', 'id', 'autoincrement');
-@@ -199,4 +199,4 @@
- 
-    return true;
- }
--?>
-\ No newline at end of file
-+?>
diff --git a/glpi-pdf.spec b/glpi-pdf.spec
index d370fc1..d145e5f 100644
--- a/glpi-pdf.spec
+++ b/glpi-pdf.spec
@@ -2,7 +2,7 @@
 #global svnrelease   315
 
 Name:           glpi-pdf
-Version:        0.84
+Version:        0.84.1
 %if 0%{?svnrelease}
 Release:        0.1.svn%{svnrelease}%{?dist}
 %else
@@ -20,12 +20,9 @@ URL:            https://forge.indepnet.net/projects/pdf
 # tar czf glpi-pdf-0.83-315.tar.gz pdf
 Source0:        glpi-pdf-0.83-%{svnrelease}.tar.gz
 %else
-Source0:        https://forge.indepnet.net/attachments/download/1666/glpi_pdf-0.84.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1730/glpi-pdf-0.84.1.tar.gz
 %endif
 
-# https://forge.indepnet.net/issues/4783
-Patch0:         changeset_r361.diff
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -47,15 +44,15 @@ informations sur un équipement ou un logiciel de l'inventaire.
 %prep
 %setup -q -c
 
+# Fix version
+sed -e "/'version'/s/'0.84'/'0.84.1'/" -i %{pluginname}/setup.php
+
 # dos2unix to avoid rpmlint warnings
 mv %{pluginname}/docs docs
 for doc in docs/* ; do
     sed -i -e 's/\r//' $doc
 done
 
-cd %{pluginname}
-%patch0 -p1
-
 
 %build
 # Regenerate the locales
@@ -97,6 +94,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 0.84.1-1
+- version 0.84.1
+  https://forge.indepnet.net/projects/pdf/versions/1019
+
 * Wed Feb 12 2014 Remi Collet <remi@fedoraproject.org> - 0.84-1
 - version 0.84 for GLPI 0.84
   https://forge.indepnet.net/projects/pdf/versions/941
-- 
cgit