summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--glpi-data-injection.spec20
2 files changed, 21 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e7a406a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.tar.bz2
+*.src.rpm
+*/*rpm
diff --git a/glpi-data-injection.spec b/glpi-data-injection.spec
index 79b7b95..1002b33 100644
--- a/glpi-data-injection.spec
+++ b/glpi-data-injection.spec
@@ -1,6 +1,6 @@
# spec file for glpi-data-injection
#
-# Copyright (c) 2007-2017 Remi Collet
+# Copyright (c) 2007-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -9,7 +9,7 @@
%global pluginname datainjection
Name: glpi-data-injection
-Version: 2.4.2
+Version: 2.5.0
Release: 1%{?dist}
Summary: Plugin for importing data into GLPI
Summary(fr): Extension pour importer des données dans GLPI
@@ -18,13 +18,13 @@ Group: Applications/Internet
License: GPLv2+
URL: https://forge.glpi-project.org/projects/datainjection
-Source0: https://github.com/pluginsGLPI/%{pluginname}/releases/download/%{version}/glpi-%{pluginname}-%{version}.tar.gz
+Source0: https://github.com/pluginsGLPI/%{pluginname}/releases/download/%{version}/glpi-%{pluginname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.84
-Requires: glpi < 9.2
+Requires: glpi >= 9.2
+Requires: glpi < 9.3
# This plugin have been renamed
Provides: glpi-%{pluginname} = %{version}-%{release}
@@ -68,8 +68,9 @@ for fic in docs/*; do
done
# don't need this
-rm -f %{pluginname}/testwebservice.php
-rm -rf %{pluginname}/tools
+rm %{pluginname}/testwebservice.php
+rm %{pluginname}/composer.json
+rm -r %{pluginname}/vendor
%build
@@ -104,7 +105,7 @@ rm -rf %{buildroot}
%{_datadir}/glpi/plugins/%{pluginname}/css
%{_datadir}/glpi/plugins/%{pluginname}/front
%{_datadir}/glpi/plugins/%{pluginname}/inc
-%{_datadir}/glpi/plugins/%{pluginname}/javascript
+%{_datadir}/glpi/plugins/%{pluginname}/js
%{_datadir}/glpi/plugins/%{pluginname}/pics
# Need here, required from the Interface
%{_datadir}/glpi/plugins/%{pluginname}/LICENSE
@@ -113,6 +114,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 2.5.0-1
+- update to 2.5.0 for GLPI 9.2
+
* Fri Sep 23 2016 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.2-1
- Last upstream release, 9.1 compatible