summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-03-01 18:35:15 +0100
committerRemi Collet <fedora@famillecollet.com>2015-03-01 18:35:15 +0100
commita49e2802a6012667328c905861a6947bc4a84fa8 (patch)
tree7d8e411ef43a2710e7b661e1fda5dad69fd03938
parent4cc0ffb037df5243285fc1a14bb95ab5651a0f48 (diff)
glpi-ocsinventoryng: 1.1.0 (glpi 0.85)
-rw-r--r--glpi-ocsinventoryng-dev.spec18
-rw-r--r--glpi-ocsinventoryng.spec2
2 files changed, 12 insertions, 8 deletions
diff --git a/glpi-ocsinventoryng-dev.spec b/glpi-ocsinventoryng-dev.spec
index eb07890..2dea715 100644
--- a/glpi-ocsinventoryng-dev.spec
+++ b/glpi-ocsinventoryng-dev.spec
@@ -2,7 +2,7 @@
#
# Copyright (c) 2013-2015 Remi Collet
# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
@@ -10,7 +10,7 @@
%global lockname ocsinventoryng.lock
Name: glpi-ocsinventoryng
-Version: 1.0.3
+Version: 1.1.0
Release: 1%{?dist}
Summary: Plugin to synchronize GLPI with OCS Inventory NG
@@ -18,15 +18,15 @@ Group: Applications/Internet
License: GPLv2+
URL: https://forge.indepnet.net/projects/ocsinventoryng
-Source0: https://forge.indepnet.net/attachments/download/1847/glpi-ocsinventoryng-1.0.3.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1966/glpi-ocsinventoryng-1.1.0.tar.gz
Source1: %{name}-httpd.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
-Requires: glpi >= 0.84
-Requires: glpi < 0.85
+Requires: glpi >= 0.85
+Requires: glpi < 0.86
Requires: crontabs
Requires: php-cli
# phpcompatinfo for version 1.0.2
@@ -91,7 +91,7 @@ done
%install
-rm -rf %{buildroot}
+rm -rf %{buildroot}
# Plugin
mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
@@ -116,7 +116,7 @@ touch %{buildroot}%{_localstatedir}/lib/glpi/files/_lock/%{lockname}
%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}
%post
@@ -161,6 +161,10 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
%changelog
+* Sun Mar 1 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0 for GLPI 0.85+
+ https://forge.indepnet.net/versions/1116
+
* Mon Sep 8 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
- Update to 1.0.3 for GLPI 0.84+
https://forge.indepnet.net/versions/957
diff --git a/glpi-ocsinventoryng.spec b/glpi-ocsinventoryng.spec
index eb07890..bcb3b93 100644
--- a/glpi-ocsinventoryng.spec
+++ b/glpi-ocsinventoryng.spec
@@ -2,7 +2,7 @@
#
# Copyright (c) 2013-2015 Remi Collet
# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#