SPECS (AC-branch): mc.spec - use %service; rel 6

[glen]

Author: glen                         Date: Mon May 22 20:45:10 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service; rel 6

---- Files affected:
SPECS:
   mc.spec (1.228 -> 1.228.2.1) 

---- Diffs:

================================================================
Index: SPECS/mc.spec
diff -u SPECS/mc.spec:1.228 SPECS/mc.spec:1.228.2.1
--- SPECS/mc.spec:1.228	Mon Dec 26 17:17:06 2005
+++ SPECS/mc.spec	Mon May 22 22:45:05 2006
@@ -20,7 +20,7 @@
 Summary(zh_CN):	Ňť¸öˇ˝ąăĘľÓĂľÄÎÄźţšÜŔíĆ÷şÍĐéÄâShell
 Name:		mc
 Version:	4.6.1
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/Shells
 Source0:	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/%{name}-%{version}.tar.gz
@@ -75,6 +75,7 @@
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 %if %{with utf8}
 BuildRequires:	slang-devel >= 1:2.0.0
@@ -82,15 +83,15 @@
 %ifnarch s390 s390x
 BuildRequires:	gpm-devel
 %endif
-# Needed? %%{?with_perl_vfs:Requires:	perl-base}
 %{?with_x:BuildRequires:	XFree86-devel}
 %{?with_ext2undel:BuildRequires:	e2fsprogs-devel}
+# Needed? %%{?with_perl_vfs:Requires:	perl-base}
 Requires:	file
 Requires:	pam >= 0.77.3
 Requires:	setup >= 2.4.6-2
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	tkmc
 Conflicts:	rpm < 4.0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	 -fomit-frame-pointer
 
@@ -399,17 +400,11 @@
 
 %post -n mcserv
 /sbin/chkconfig --add mcserv
-if [ -f /var/lock/subsys/mcserv ]; then
-	/etc/rc.d/init.d/mcserv restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/mcserv start\" to start mcserv daemon."
-fi
+%service mcserv restart "mcserv daemon"
 
 %preun -n mcserv
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/mcserv ]; then
-		/etc/rc.d/init.d/mcserv stop >&2
-	fi
+	%service mcserv stop
 	/sbin/chkconfig --del mcserv
 fi
 
@@ -512,6 +507,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228.2.1  2006/05/22 20:45:05  glen
+- use %service; rel 6
+
 Revision 1.228  2005/12/26 16:17:06  hawk
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mc.spec?r1=1.228&r2=1.228.2.1&f=u