[packages/percona-monitoring-plugins] fix make mkdir conflict
glen
glen at pld-linux.org
Thu Mar 15 12:51:41 CET 2018
commit 5552bf28747a2f3e5743a3fd6c2b85ddd3ea1159
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Mar 15 13:37:36 2018 +0200
fix make mkdir conflict
make.patch | 14 ++++++++++++++
percona-monitoring-plugins.spec | 2 ++
2 files changed, 16 insertions(+)
---
diff --git a/percona-monitoring-plugins.spec b/percona-monitoring-plugins.spec
index c32f293..a84faec 100644
--- a/percona-monitoring-plugins.spec
+++ b/percona-monitoring-plugins.spec
@@ -21,6 +21,7 @@ Source2: ssh_config.php
Patch0: config.patch
Patch1: paths.patch
Patch2: perl.patch
+Patch3: make.patch
URL: https://www.percona.com/software/database-tools/percona-monitoring-plugins
BuildRequires: rpmbuild(macros) >= 1.630
BuildRequires: sed >= 4.0
@@ -93,6 +94,7 @@ This is a set of templates for monitoring Redis servers with Cacti.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%{__sed} -i -e '1i#!/usr/bin/php' cacti/scripts/*.php
chmod a+rx cacti/scripts/*.php
diff --git a/make.patch b/make.patch
new file mode 100644
index 0000000..ceff0d6
--- /dev/null
+++ b/make.patch
@@ -0,0 +1,14 @@
+--- percona-monitoring-plugins-1.1.8/make.sh~ 2018-03-15 13:01:12.000000000 +0200
++++ percona-monitoring-plugins-1.1.8/make.sh 2018-03-15 13:01:18.688682550 +0200
+@@ -40,9 +40,9 @@
+ cp cacti/scripts/ss_get_mysql_stats.php release/code/zabbix/scripts
+ cp COPYING Changelog release/code
+ cp Changelog release/docs/changelog.rst
+-mkdir release/{docs/html,code/cacti/templates,code/zabbix/templates}
++mkdir -p release/{docs/html,code/cacti/templates,code/zabbix/templates}
+
+-# Cleanup of tmp files
++# Cleanup of tmp files
+ find release/ -name "*.~*~" -exec rm -f {} \;
+ find release/ -name "*.pyc" -exec rm -f {} \;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-monitoring-plugins.git/commitdiff/84858c232e9238e65d90213593853490605b4379
More information about the pld-cvs-commit
mailing list