SPECS (AC-branch): bind.spec - use %service

[glen]

Author: glen                         Date: Fri Apr 14 12:14:03 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service

---- Files affected:
SPECS:
   bind.spec (1.198.2.10 -> 1.198.2.11) 

---- Diffs:

================================================================
Index: SPECS/bind.spec
diff -u SPECS/bind.spec:1.198.2.10 SPECS/bind.spec:1.198.2.11
--- SPECS/bind.spec:1.198.2.10	Fri Apr 14 14:11:05 2006
+++ SPECS/bind.spec	Fri Apr 14 14:13:58 2006
@@ -51,7 +51,7 @@
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
-BuildRequires:	rpmbuild(macros) >= 1.176
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -365,10 +365,11 @@
 
 touch $RPM_BUILD_ROOT%{_var}/lib/named/{named.{log,stats},dev/{random,null}}
 
-%{?with_ldap:mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/schema/}
+%{?with_ldap:install -d $RPM_BUILD_ROOT%{_datadir}/openldap/schema}
 %{?with_ldap:install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/openldap/schema/dnszone.schema}
 
 # we don't want Makefiles in documentation...
+# FIXME: breaks re-entrant install
 rm -f doc/misc/Makefile*
 
 %clean
@@ -413,19 +414,11 @@
 
 %post
 /sbin/chkconfig --add named
-if [ -f /var/lock/subsys/named ]; then
-	/etc/rc.d/init.d/named restart 1>&2
-else
-	%banner %{name} -e << EOF
-Type "/etc/rc.d/init.d/named start" to start named.
-EOF
-fi
+%service named restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/named ]; then
-		/etc/rc.d/init.d/named stop 1>&2
-	fi
+	%service named stop
 	/sbin/chkconfig --del named
 fi
 
@@ -523,6 +516,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.198.2.11  2006/04/14 12:13:58  glen
+- use %service
+
 Revision 1.198.2.10  2006/04/14 12:11:05  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bind.spec?r1=1.198.2.10&r2=1.198.2.11&f=u