Author: glen Date: Wed Oct 6 08:08:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- revert libexec patch, default is ok
---- Files affected:
packages/mysql-mmm:
mmm_common.conf (1.1 -> 1.2) , mmm_mon.conf (1.1 -> 1.2) , mysql-mmm.spec
(1.3 -> 1.4) , mysql-mmm-paths.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mysql-mmm/mmm_common.conf
diff -u packages/mysql-mmm/mmm_common.conf:1.1
packages/mysql-mmm/mmm_common.conf:1.2
--- packages/mysql-mmm/mmm_common.conf:1.1 Wed Oct 6 09:50:34 2010
+++ packages/mysql-mmm/mmm_common.conf Wed Oct 6 10:08:09 2010
@@ -3,7 +3,7 @@
<host default>
cluster_interface eth0
pid_path /var/run/mysql-mmm/mmm_agentd.pid
- bin_path /usr/libexec/mysql-mmm/
+ bin_path /usr/lib/mysql-mmm/
replication_user replicant
replication_password slave
agent_user mmm_agent
================================================================
Index: packages/mysql-mmm/mmm_mon.conf
diff -u packages/mysql-mmm/mmm_mon.conf:1.1 packages/mysql-mmm/mmm_mon.conf:1.2
--- packages/mysql-mmm/mmm_mon.conf:1.1 Wed Oct 6 09:50:34 2010
+++ packages/mysql-mmm/mmm_mon.conf Wed Oct 6 10:08:09 2010
@@ -3,7 +3,7 @@
<monitor>
ip 127.0.0.1
pid_path /var/run/mysql-mmm/mmm_mond.pid
- bin_path /usr/libexec/mysql-mmm
+ bin_path /usr/lib/mysql-mmm
status_path /var/lib/mysql-mmm/mmm_mond.status
ping_ips 192.168.100.50
auto_set_online 60
@@ -12,7 +12,7 @@
# throw a warning about it missing. See the section 5.10 "Kill Host
# Functionality" in the PDF documentation.
#
- # kill_host_bin /usr/libexec/mysql-mmm/monitor/kill_host
+ # kill_host_bin /usr/lib/mysql-mmm/monitor/kill_host
#
</monitor>
================================================================
Index: packages/mysql-mmm/mysql-mmm.spec
diff -u packages/mysql-mmm/mysql-mmm.spec:1.3
packages/mysql-mmm/mysql-mmm.spec:1.4
--- packages/mysql-mmm/mysql-mmm.spec:1.3 Wed Oct 6 10:05:08 2010
+++ packages/mysql-mmm/mysql-mmm.spec Wed Oct 6 10:08:09 2010
@@ -20,7 +20,6 @@
Source7: mmm_mon.conf
Source8: mmm_tools.conf
Source9: mmm_common.conf
-Patch0: %{name}-paths.patch
Obsoletes: mmm
Obsoletes: mysql-master-master
BuildArch: noarch
@@ -78,7 +77,6 @@
%prep
%setup -q
-%patch0 -p1
cp -a %{SOURCE1} %{name}-%{version}.pdf
grep -rl /usr/bin/env bin sbin | xargs %{__sed} -i -e
'1s,^#!.*perl,#!%{__perl},'
@@ -93,7 +91,6 @@
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- BINDIR='$(DESTDIR)/%{_libdir}/%{name}' \
DESTDIR=$RPM_BUILD_ROOT
# additional
@@ -206,6 +203,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/10/06 08:08:09 glen
+- revert libexec patch, default is ok
+
Revision 1.3 2010/10/06 08:05:08 glen
- pldize initscripts
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-mmm/mmm_common.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-mmm/mmm_mon.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-mmm/mysql-mmm.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
