[glpi-data-injection/f17] update to 2.2.4

[Remi Collet]

commit 9d422c9c51a1c3db056a7abc109127a8970a2b2c
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Dec 12 11:42:23 2012 +0100

    update to 2.2.4

 .gitignore               |    8 +++-----
 glpi-data-injection.spec |   13 ++++++++++---
 sources                  |    2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21c90fc..8389e5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-*~
-/glpi-datainjection-2.0.2.tar.gz
-/glpi-datainjection-2.1.2.tar.gz
-/glpi-datainjection-2.2.0.tar.gz
-/glpi-datainjection-2.2.2.tar.gz
+*spec~
+/glpi-datainjection-2.2.3.tar.gz
+/glpi-datainjection-2.2.4.tar.gz
diff --git a/glpi-data-injection.spec b/glpi-data-injection.spec
index f8112b3..46f9dde 100644
--- a/glpi-data-injection.spec
+++ b/glpi-data-injection.spec
@@ -1,7 +1,7 @@
 %global pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        2.2.2
+Version:        2.2.4
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des données dans GLPI
@@ -11,13 +11,13 @@ License:        GPLv2+
 
 URL:            https://forge.indepnet.net/projects/datainjection
 # This change for each new version
-Source0:        https://forge.indepnet.net/attachments/download/1206/glpi-datainjection-2.2.2.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1352/glpi-datainjection-2.2.4.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:       glpi >= 0.83.3
-Requires:       glpi <  0.84
+Conflicts:      glpi >= 0.84
 Requires:       glpi-pdf
 
 # This plugin have been renamed
@@ -97,6 +97,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 12 2012 Remi Collet <Fedora at FamilleCollet.com> - 2.2.4-1
+- version 2.2.4 for GLPI 0.83.x
+  https://forge.indepnet.net/projects/datainjection/versions/818
+
+- version 2.2.3 for GLPI 0.83.3
+  https://forge.indepnet.net/projects/datainjection/versions/795
+
 * Thu Jul 12 2012 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-1
 - version 2.2.2 for GLPI 0.83.3
   https://forge.indepnet.net/projects/datainjection/versions/782
diff --git a/sources b/sources
index a8e86fb..ea84432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c8501b9cbb42f010e3f7306623c6bb8  glpi-datainjection-2.2.2.tar.gz
+0a4686e4206a37a877ec3a3a0b44e405  glpi-datainjection-2.2.4.tar.gz