From 12d98555e3895ac026b9387947222dda19bd9167 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sep 15 2013 16:20:37 +0000
Subject: Cleanup the spec somewhat


---

diff --git a/mysql-mmm.spec b/mysql-mmm.spec
index 022b7bd..c74b900 100644
--- a/mysql-mmm.spec
+++ b/mysql-mmm.spec
@@ -18,7 +18,6 @@ Source7: mmm_mon.conf
 Source8: mmm_tools.conf
 Source9: mmm_common.conf
 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Provides: mmm = %{version}-%{release}
 Provides: mysql-master-master = %{version}-%{release}
@@ -68,8 +67,8 @@ Provides: mysql-master-master-tools = %{version}-%{release}
 Provides: mmm-tools = %{version}-%{release}
 
 %description tools
-Scripts and libraries dedicated to management of the mmmd_mon processes
-by com- mands.
+Scripts and libraries dedicated to management of the mmm_mond processes
+by commands.
 
 %prep
 %setup -q
@@ -83,17 +82,11 @@ Full documentation can be found at:
 EOF
 
 
-%patch0 -p1 
+%patch0 -p1
 find . -type f -name "*.orig" -print0 | xargs -0r rm
 
 
-%build
-# pass
-
 %install
-rm -rf %{buildroot}
-
-# Install
 make install DESTDIR=%{buildroot}
 
 # additional
@@ -102,23 +95,23 @@ make install DESTDIR=%{buildroot}
              %{buildroot}%{_localstatedir}/lib/%{name} \
              %{buildroot}%{_localstatedir}/lock/subsys
 
-install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
+%{__install} -p -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
 
 # Replace config files
 %{__rm} -f %{buildroot}%{_sysconfdir}/mysql-mmm/*.conf
 
-install -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
-install -m 0640 %SOURCE6 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_agent.conf
-install -m 0640 %SOURCE7 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon.conf
-install -m 0640 %SOURCE8 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_tools.conf
-install -m 0640 %SOURCE9 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_common.conf
+%{__install} -p -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
+%{__install} -p -m 0640 %SOURCE6 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_agent.conf
+%{__install} -p -m 0640 %SOURCE7 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon.conf
+%{__install} -p -m 0640 %SOURCE8 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_tools.conf
+%{__install} -p -m 0640 %SOURCE9 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_common.conf
 
 # Replace our init scripts
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
-install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
-install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
+%{__install} -D -p -m 0755 %SOURCE3 %{buildroot}%{_initddir}/mysql-mmm-agent
+%{__install} -D -p -m 0755 %SOURCE4 %{buildroot}%{_initddir}/mysql-mmm-monitor
 
 # Create defaults files
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/default
@@ -139,10 +132,6 @@ cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-monitor <<EOF
 ENABLED=1
 EOF
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %post agent
 if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add mysql-mmm-agent
@@ -200,7 +189,7 @@ fi
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-agent
 %ghost %{_localstatedir}/run/mysql-mmm/mmm_agentd.pid
-%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
+%attr(755,root,root) %{_initddir}/mysql-mmm-agent
 %ghost %{_localstatedir}/lock/subsys/mysql-mmm-agent
 %{perl_vendorlib}/MMM/Agent
 %{_libexecdir}/mysql-mmm/agent/
@@ -212,7 +201,7 @@ fi
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-monitor
-%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
+%attr(755,root,root) %{_initddir}/mysql-mmm-monitor
 %ghost %{_localstatedir}/run/mysql-mmm/mmm_mond.pid
 %ghost %{_localstatedir}/lock/subsys/mysql-mmm-monitor
 %{perl_vendorlib}/MMM/Monitor
@@ -342,7 +331,7 @@ fi
   libnet
 - Keep etc config files actually in /etc, symlink at _mmm_instdir/etc
 
-* Thu Sep 23 2009 BJ Dierkes <wdierkes@rackspace.com> - 1.2.6-3.rs
+* Wed Sep 23 2009 BJ Dierkes <wdierkes@rackspace.com> - 1.2.6-3.rs
 - Cleaned up spec a bit further, moved sed changes to patches
 - Added Patch1: mysql-master-master-1.2.6-libnet_1.1.patch
 - Added Patch2: mysql-master-master-1.2.6-paths.patch
@@ -363,14 +352,14 @@ fi
 - Change /etc/init.d/mysql-mmm_{mon,agent} back to mmm_{mon,agent}
 - symlink /etc/mysql-mmm to /usr/lib/mysql-mmm (not the other way around)
 
-* Mon Apr 14 2009 Andrew Garner <andrew.garner@rackspace.com>
+* Tue Apr 14 2009 Andrew Garner <andrew.garner@rackspace.com>
 - Cleanup spec
 - Use standard state/log paths
 - Rebuild fping
 - Added dist suffix
 - Changed Release to 4.rs-abg
 
-* Sun Apr 13 2009 Andrew Garner <andrew.garner@rackspace.com>
+* Mon Apr 13 2009 Andrew Garner <andrew.garner@rackspace.com>
 - Fix send_arp for RHEL 5.3's libnet
 - Changed /usr/local/mmm to /usr/lib/mysql-mmm/
 - Changed /etc/init.d/mmm_{mon,agent} to mysql-mmm_{mon,agent}