summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-09-16 12:12:40 +0200
committerRemi Collet <fedora@famillecollet.com>2015-09-16 12:12:40 +0200
commit86302192ccc387815bfe23b29f31b59d2f0db32f (patch)
treeec254045444ffa702b6032a281ed8b3b3338fd69
parent8d8b39ac675851145e4921507313fae3133f2fa0 (diff)
glpi-ocsinventoryng: 1.1.2
-rw-r--r--glpi-ocsinventoryng-dev.spec20
1 files changed, 9 insertions, 11 deletions
diff --git a/glpi-ocsinventoryng-dev.spec b/glpi-ocsinventoryng-dev.spec
index fe52810..d2ef6e9 100644
--- a/glpi-ocsinventoryng-dev.spec
+++ b/glpi-ocsinventoryng-dev.spec
@@ -1,4 +1,4 @@
-# spec file for glpi-ocsinventoryng
+# remirepo spec file for glpi-ocsinventoryng
#
# Copyright (c) 2013-2015 Remi Collet
# License: CC-BY-SA
@@ -10,7 +10,7 @@
%global lockname ocsinventoryng.lock
Name: glpi-ocsinventoryng
-Version: 1.1.1
+Version: 1.1.2
Release: 1%{?dist}
Summary: Plugin to synchronize GLPI with OCS Inventory NG
@@ -18,12 +18,9 @@ Group: Applications/Internet
License: GPLv2+
URL: https://forge.indepnet.net/projects/ocsinventoryng
-Source0: https://forge.indepnet.net/attachments/download/1975/glpi-ocsinventoryng-1.1.1.tar.gz
+Source0: https://forge.glpi-project.org/attachments/download/2094/glpi-ocsinventoryng-1.1.2.tar.gz
Source1: %{name}-httpd.conf
-# https://forge.indepnet.net/issues/5359
-Patch0: %{name}-bug5359.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
@@ -53,15 +50,12 @@ plugin features to provide better compatibility and extensibility with OCS.
%prep
%setup -q -c
-pushd %{pluginname}
-%patch0 -p1
-popd
-
mv %{pluginname}/docs docs
# dos2unix to avoid rpmlint warnings
for doc in docs/* ; do
sed -i -e 's/\r//' $doc
+ chmod -x $doc
done
# Create link to LICENSE for standard doc folder
@@ -85,8 +79,8 @@ cat <<EOF | tee cron
EOF
# fix perms
+find %{pluginname} -type f -exec chmod -x {} \;
chmod +x %{pluginname}/scripts/*.sh
-chmod -x %{pluginname}/scripts/*.php
%build
@@ -168,6 +162,10 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
%changelog
+* Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2 for GLPI 0.85+
+ https://forge.glpi-project.org/versions/1131
+
* Mon Jun 8 2015 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
- Update to 1.1.1 for GLPI 0.85+
- add upstream patch for https://forge.indepnet.net/issues/5359