[glpi-data-injection/el5] update to 2.0.2 for glpi 0.78

Remi Collet remi at fedoraproject.org
Sun Jul 24 07:59:19 UTC 2011


commit a289e2979e307b51443a24739205dc712ad00154
Author: remi <fedora at famillecollet.com>
Date:   Sun Jul 24 09:58:56 2011 +0200

    update to 2.0.2 for glpi 0.78

 .gitignore               |    2 ++
 glpi-data-injection.spec |   25 +++++++++++++++----------
 sources                  |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7d93d17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+/glpi-datainjection-2.0.2.tar.gz
diff --git a/glpi-data-injection.spec b/glpi-data-injection.spec
index 2ad5731..edd478c 100644
--- a/glpi-data-injection.spec
+++ b/glpi-data-injection.spec
@@ -1,7 +1,7 @@
 %define pluginname   datainjection
 
 Name:           glpi-data-injection
-Version:        1.7.2
+Version:        2.0.2
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des données dans GLPI
@@ -9,14 +9,14 @@ Summary(fr):    Extension pour importer des données dans GLPI
 Group:          Applications/Internet
 License:        GPLv2+
 
-URL:            https://forge.indepnet.net/projects/show/datainjection
-#               This change for each new version
-Source0:        https://forge.indepnet.net/attachments/download/497/glpi-datainjection-1.7.2.tar.gz
+URL:            https://forge.indepnet.net/projects/datainjection
+# This change for each new version
+Source0:        https://forge.indepnet.net/attachments/download/899/glpi-datainjection-2.0.2.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.72
+Requires:       glpi >= 0.78.2
 
 # This plugin is renamed (for 0.72)
 Provides:       glpi-datainjection = %{version}-%{release}
@@ -27,7 +27,7 @@ Plugin for importing data into GLPI
 It'll can serve, for example, to :
 - import machines at the delivery (electronic delivery order in CSV)
 - import additional data
-- import equipments not managed by OCS
+- import equipment not managed by OCS
 - transmit from an other tool of asset management
 
 %description -l fr
@@ -43,7 +43,6 @@ Elle pourra servir, par exemple, à :
 %prep
 %setup -q -c
 
-#mv %{pluginname}/test test
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -54,6 +53,12 @@ for fic in docs/*; do
   rm $fic.ref
 done
 
+# don't need this
+rm -f testwebservice.php
+
+# fix in SVN...
+chmod -x datainjection/ajax/model.tabs.php
+
 
 %build
 # empty build
@@ -82,17 +87,17 @@ rm -rf %{buildroot}
 %{_datadir}/glpi/plugins/%{pluginname}/*.php
 %dir %{_datadir}/glpi/plugins/%{pluginname}/locales
 %{_datadir}/glpi/plugins/%{pluginname}/ajax
-%{_datadir}/glpi/plugins/%{pluginname}/config
 %{_datadir}/glpi/plugins/%{pluginname}/css
-%{_datadir}/glpi/plugins/%{pluginname}/fonts
 %{_datadir}/glpi/plugins/%{pluginname}/front
 %{_datadir}/glpi/plugins/%{pluginname}/inc
 %{_datadir}/glpi/plugins/%{pluginname}/javascript
 %{_datadir}/glpi/plugins/%{pluginname}/pics
 
 
-
 %changelog
+* Sat Jun 11 2011 Remi Collet <Fedora at FamilleCollet.com> - 2.0.2-1
+- version 2.0.2 for GLPI 0.78
+
 * Sun Dec 10 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.7.2-1
 - update to 1.7.2
 - fix URL + Source (link to new forge)
diff --git a/sources b/sources
index 3f41c13..26ce701 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c75844a166e5e1c0c7a649b0d03ae4fb  glpi-datainjection-1.7.2.tar.gz
+66998486fbaec9fed3e262ad66bcf1e3  glpi-datainjection-2.0.2.tar.gz


More information about the scm-commits mailing list