SPECS (AC-branch): glibc.spec - use service, adapterized

[glen]

Author: glen                         Date: Mon Feb 27 23:23:42 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use service, adapterized

---- Files affected:
SPECS:
   glibc.spec (1.583.2.71 -> 1.583.2.72) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.71 SPECS/glibc.spec:1.583.2.72
--- SPECS/glibc.spec:1.583.2.71	Sun Jan 15 21:41:06 2006
+++ SPECS/glibc.spec	Tue Feb 28 00:23:36 2006
@@ -158,15 +158,15 @@
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0.5
 BuildRequires:	texinfo
 AutoReq:	false
 Requires:	%{name}-misc = %{epoch}:%{version}-%{release}
 Requires:	basesystem
+Provides:	/sbin/ldconfig
 %{?with_tls:Provides:	glibc(tls)}
 Provides:	ldconfig
-Provides:	/sbin/ldconfig
 Obsoletes:	glibc-common
 Obsoletes:	glibc-debug
 Obsoletes:	ldconfig
@@ -334,8 +334,8 @@
 Summary(uk):	äĎÄÁÔËĎ׌ ÂŚÂĚŚĎÔĹËÉ, ĐĎÔŇŚÂÎŚ ÄĚŃ ËĎÍĐŚĚŃĂŚ§
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	%{name}-devel-utils = %{epoch}:%{version}-%{release}
+Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Provides:	%{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Obsoletes:	libiconv-devel
 
@@ -535,14 +535,14 @@
 Summary(ru):	ëÜŰÉŇŐŔÝÉĘ ÄĹÍĎÎ ÓĹŇ×ÉÓĎ× ÉÍĹÎ
 Summary(uk):	ëĹŰŐŔŢÉĘ ÄĹÍĎÎ ÓĹ×ŚÓŚ× ŚÍĹÎ
 Group:		Networking/Daemons
+Requires(post):	fileutils
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
-Requires(post):	fileutils
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	rc-scripts >= 0.2.0
@@ -603,8 +603,8 @@
 Summary(es):	Base de datos de todos los locales soportados por glibc
 Summary(pl):	Baza danych locale dla wszystkich lokalizacji obsługiwanych przez glibc
 Group:		Libraries
-Requires:	iconv = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	iconv = %{epoch}:%{version}-%{release}
 
 %description localedb-all
 This package contains locale database for all locales supported by
@@ -907,9 +907,9 @@
 Conflicts:	kernel < %{min_kernel}
 Conflicts:	ld.so < 1.9.9-10
 Conflicts:	man-pages < 1.43
+Conflicts:	poldek < 0.18.8-4
 Conflicts:	rc-scripts < 0.3.1-13
 Conflicts:	rpm < 4.1
-Conflicts:	poldek < 0.18.8-4
 
 %description -n %{name}64
 64-bit GNU libc libraries for 64bit architecture.
@@ -1322,17 +1322,11 @@
 chmod 000 /var/log/nscd
 chown root:root /var/log/nscd
 chmod 640 /var/log/nscd
-if [ -f /var/lock/subsys/nscd ]; then
-	/etc/rc.d/init.d/nscd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/nscd start\" to start nscd daemon." 1>&2
-fi
+%service nscd restart "nscd daemon"
 
 %preun -n nscd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/nscd ]; then
-		/etc/rc.d/init.d/nscd stop 1>&2
-	fi
+	%service nscd stop
 	/sbin/chkconfig --del nscd
 fi
 
@@ -1726,6 +1720,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.72  2006/02/27 23:23:36  glen
+- use service, adapterized
+
 Revision 1.583.2.71  2006/01/15 20:41:06  ankry
 - sorted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.71&r2=1.583.2.72&f=u