SPECS: mysql.spec - use %service macro for mysql server - rel 1; STBR

[glen]

Author: glen                         Date: Thu Jul 21 14:13:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service macro for mysql server
- rel 1; STBR

---- Files affected:
SPECS:
   mysql.spec (1.293 -> 1.294) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.293 SPECS/mysql.spec:1.294
--- SPECS/mysql.spec:1.293	Thu Jul 21 15:37:23 2005
+++ SPECS/mysql.spec	Thu Jul 21 16:13:50 2005
@@ -25,7 +25,7 @@
 Name:		mysql
 Group:		Applications/Databases
 Version:	4.1.13
-Release:	0.1
+Release:	1
 License:	GPL + MySQL FLOSS Exception
 Source0:	http://mysql.dataphone.se/Downloads/MySQL-4.1/%{name}-%{version}.tar.gz
 # Source0-md5:	49d7a7314a2c9cf49e34777e73e66562
@@ -66,7 +66,7 @@
 BuildRequires:	perl-devel >= 1:5.6.1
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
 PreReq:		rc-scripts >= 0.2.0
@@ -552,7 +552,6 @@
 mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump
 
 # not our OS
-rm $RPM_BUILD_ROOT%{_bindir}/make_win_*_distribution
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.plist
 # unuseful stuff
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.spec
@@ -582,17 +581,11 @@
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 /sbin/chkconfig --add mysql
-if [ -f /var/lock/subsys/mysql ]; then
-	/etc/rc.d/init.d/mysql restart >&2 || :
-else
-	echo "Run \"/etc/rc.d/init.d/mysql start\" to start mysql." >&2
-fi
+%service mysql restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/mysql ]; then
-		/etc/rc.d/init.d/mysql stop
-	fi
+	%service -q mysql stop
 	/sbin/chkconfig --del mysql
 fi
 
@@ -869,6 +862,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.294  2005/07/21 14:13:50  glen
+- use %service macro for mysql server
+- rel 1; STBR
+
 Revision 1.293  2005/07/21 13:37:23  glen
 - fetch 4.1.13 sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.293&r2=1.294&f=u