rpms/mysql-mmm/EL-6 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 mysql-mmm.spec, 1.2, 1.3 sources, 1.3, 1.4

derks derks at fedoraproject.org
Tue May 11 17:49:52 UTC 2010


Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25780/EL-6

Modified Files:
	.cvsignore import.log mysql-mmm.spec sources 
Log Message:
- Latest upstream release, fixes possible errors related to
  replication. Full ChangeLog available at:
  http://mysql-mmm.org/mmm2:changelog




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Mar 2010 19:19:44 -0000	1.3
+++ .cvsignore	11 May 2010 17:49:52 -0000	1.4
@@ -1,2 +1,2 @@
-mysql-mmm-2.2.0.pdf
-mysql-mmm-2.2.0.tar.gz
+mysql-mmm-2.2.1.pdf
+mysql-mmm-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-6/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	29 Mar 2010 19:19:44 -0000	1.2
+++ import.log	11 May 2010 17:49:52 -0000	1.3
@@ -1,2 +1,3 @@
 mysql-mmm-2_0_10-4:F-12:mysql-mmm-2.0.10-4.src.rpm:1260821179
 mysql-mmm-2_2_0-1_fc12:F-12:mysql-mmm-2.2.0-1.fc12.src.rpm:1269890368
+mysql-mmm-2_2_1-1_fc12:EL-6:mysql-mmm-2.2.1-1.fc12.src.rpm:1273600150


Index: mysql-mmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-6/mysql-mmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mysql-mmm.spec	29 Mar 2010 19:19:45 -0000	1.2
+++ mysql-mmm.spec	11 May 2010 17:49:52 -0000	1.3
@@ -1,6 +1,6 @@
 
 Name: mysql-mmm
-Version: 2.2.0
+Version: 2.2.1
 Release: 1%{?dist}
 Summary: Multi-Master Replication Manager for MySQL
 License: GPLv2
@@ -67,7 +67,7 @@ Provides: mysql-master-master-tools = %{
 Provides: mmm-tools = %{version}-%{release}
 
 %description tools 
-Scripts and libraries dedicated to management of the mmm_mond processes 
+Scripts and libraries dedicated to management of the mmmd_mon processes 
 by com- mands.
 
 %prep
@@ -97,8 +97,7 @@ make install DESTDIR=%{buildroot}
 # additional
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d \
              %{buildroot}%{_localstatedir}/run/%{name} \
-             %{buildroot}%{_localstatedir}/lib/%{name} \
-             %{buildroot}%{_datadir}/mysql-mmm
+             %{buildroot}%{_localstatedir}/lib/%{name}
 
 install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
 
@@ -130,42 +129,10 @@ cat >%{buildroot}%{_sysconfdir}/default/
 # mysql-mmm-monitor defaults
 ENABLED=1
 EOF
-
-
+ 
 %clean
 %{__rm} -rf %{buildroot}
 
-%pre agent
-# For pre 2.1.0 compatibility
-if [ $1 -ge 2 ]; then
-    # check for old pid path
-    if [ -e %{_localstatedir}/run/mysql-mmm/mmmd_agent.pid ]; then
-        mv %{_localstatedir}/run/mysql-mmm/mmmd_agent.pid \
-            %{_localstatedir}/run/mysql-mmm/mmm_agentd.pid >/dev/null 2>&1 ||:
-        mv %{_localstatedir}/log/mysql-mmm/mmmd_agent.log \
-            %{_localstatedir}/log/mysql-mmm/mmm_agentd.log >/dev/null 2>&1 ||:
-        sed -i 's|mmmd_agent|mmm_agentd|g' %{_sysconfdir}/mysql-mmm/mmm_common.conf >/dev/null 2>&1 ||:
-    fi
-fi
-
-%pre monitor
-# For pre 2.1.0 compatibility
-if [ $1 -ge 2 ]; then
-    # check for old pid path
-    if [ -e %{_localstatedir}/run/mysql-mmm/mmmd_mon.pid ]; then
-        mv %{_localstatedir}/run/mysql-mmm/mmmd_mon.pid \
-            %{_localstatedir}/run/mysql-mmm/mmm_mond.pid >/dev/null 2>&1 ||:
-        mv %{_localstatedir}/log/mysql-mmm/mmmd_mon.log \
-            %{_localstatedir}/log/mysql-mmm/mmm_mond.log >/dev/null 2>&1 ||:
-        sed -i 's|mmmd_mon|mmm_mond|g' %{_sysconfdir}/mysql-mmm/mmm_mon.conf >/dev/null 2>&1 ||:
-        sed -i 's|mmmd_mon|mmm_mond|g' %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf >/dev/null 2>&1 ||:
-    fi
-    # check for old status path
-    if [ -e %{_localstatedir}/lib/mysql-mmm/mmmd_mon.status ]; then
-        mv %{_localstatedir}/lib/mysql-mmm/mmmd_mon.status \
-            %{_localstatedir}/lib/mysql-mmm/mmm_mond.status >/dev/null 2>&1 ||:
-    fi
-fi
 
 %post agent
 if [ $1 -eq 1 ]; then 
@@ -176,8 +143,6 @@ elif [ $1 -ge 2 ]; then
 fi
 
 
-
-
 %post monitor
 if [ $1 -eq 1 ]; then 
     /sbin/chkconfig --add mysql-mmm-monitor 
@@ -206,7 +171,6 @@ fi
 %attr(755,root,root) %dir %{_localstatedir}/lib/mysql-mmm
 %attr(755,root,root) %dir %{_localstatedir}/run/mysql-mmm
 %attr(755,root,root) %dir %{_localstatedir}/log/mysql-mmm
-%attr(755,root,root) %dir %{_datadir}/mysql-mmm
 %config(noreplace) %{_sysconfdir}/logrotate.d/mysql-mmm
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_common.conf
 %{perl_vendorlib}/MMM/Common
@@ -245,21 +209,23 @@ fi
 
 
 %changelog
+* Tue May 11 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.2.1-1
+- Latest upstream release, fixes possible errors related to 
+  replication. Full ChangeLog available at: 
+  http://mysql-mmm.org/mmm2:changelog
+
 * Wed Mar 10 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.2.0-1
-- Latest upstream release.  Resolves LaunchPad Issues 416572, 422549,
+- Latest upstream release.  Resolves LaunchPad Issues 416572, 422549, 
   531011, 531841, 525719. Full ChangeLog available at:
   http://mysql-mmm.org/mmm2:changelog
-- Removed Patch5: mysql-mmm-2.1.1-backward_compat.patch, sed conf files 
-  in pre instead (if old pid exists).
-  
+
 * Mon Mar 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.1-1
-- Latest source provides minor update for DBI timeout handling
-  Full changelog available: http://mysql-mmm.org/mmm2:changelog
+- Latest upstream release, resolves DBI timeout issue. Full changelog
+  available at: http://mysql-mmm.org/mmm2:changelog
+- Removing Patch4: mysql-mmm-2.0.10-default_logging.patch (applied upstream)
+
+* Fri Feb 26 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-4
 - Agent Requires: perl-DBD-mysql.  Resolves BZ #568870
-- Removed Patch4: mysql-mmm-2.0.10-default_logging.patch (applied
-  upstream) 
-- Added Patch5: mysql-mmm-2.1.1-backward_compat.patch for backward
-  compat with mmm < 2.0
 
 * Thu Feb 25 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-3
 - Fixed init scripts to check for ENABLED only within the start
@@ -272,8 +238,7 @@ fi
 - Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced
 
 * Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1.1
-- Latest sources from upstream adds a number of bug fixes.  Full
-  changelog available at http://mysql-mmm.org/mmm2:changelog
+- Latest sources from upstream
 - Updated init scripts to reflect new binary paths 
   (i.e. mmmd_agent -> mmm_agentd)
 - Updated Patch0: mysql-mmm-2.1.0-paths.patch 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Mar 2010 19:19:45 -0000	1.3
+++ sources	11 May 2010 17:49:52 -0000	1.4
@@ -1,2 +1,2 @@
-b8c296f6c829e28c15b474dbcb989e45  mysql-mmm-2.2.0.pdf
-816ce41a03b60fb9efab8cd5f79a2bf2  mysql-mmm-2.2.0.tar.gz
+180dbb5662fd66291d01913e0fe34842  mysql-mmm-2.2.1.pdf
+f5f8b48bdf89251d3183328f0249461e  mysql-mmm-2.2.1.tar.gz



More information about the scm-commits mailing list