SPECS: hotplug.spec - use %service

[glen]

Author: glen                         Date: Mon Feb 27 23:38:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   hotplug.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/hotplug.spec
diff -u SPECS/hotplug.spec:1.59 SPECS/hotplug.spec:1.60
--- SPECS/hotplug.spec:1.59	Wed Oct 19 18:02:37 2005
+++ SPECS/hotplug.spec	Tue Feb 28 00:38:50 2006
@@ -4,8 +4,8 @@
 Name:		hotplug
 Version:	2004_09_23
 Release:	4
-Group:		Applications/System
 License:	GPL
+Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 # Source0-md5:	58e6995f9df71ce59b0ec2787019e5fe
 Source1:	%{name}.init
@@ -17,12 +17,12 @@
 Patch2:		%{name}-devlabel.patch
 Patch3:		%{name}-sh_shift9.patch
 URL:		http://linux-hotplug.sourceforge.net/
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
-Requires:	rc-scripts
 Requires:	/sbin/chkconfig
 Requires:	awk
 Requires:	bash
+Requires:	rc-scripts
 Requires:	sed
 # Requires wc
 Requires:	textutils
@@ -95,16 +95,16 @@
 Summary:	Hotplug definitions for USB digital cameras
 Summary(pl):	Definicje Hotpluga dla aparatów cyfrowych na USB
 Group:		Applications/System
-Obsoletes:	udev-digicam
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(postun):	/usr/sbin/groupdel
 Requires(post,postun):	fileutils
 Requires(post,postun):	grep
+Requires(postun):	/usr/sbin/groupdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires:	%{name} = %{version}-%{release}
 Requires:	libgphoto2
 Requires:	util-linux
-Requires:	%{name} = %{version}-%{release}
 Provides:	group(digicam)
+Obsoletes:	udev-digicam
 
 %description digicam
 This creates appropriate definitions to usb.usermap for digital
@@ -148,9 +148,7 @@
 
 %preun
 if [ "$1" = "0" ] ; then
-	if [ -f /var/lock/subsys/hotplug ]; then
-		/etc/rc.d/init.d/hotplug stop >&2
-	fi
+	%service hotplug stop
 	/sbin/chkconfig --del hotplug
 fi
 
@@ -177,8 +175,8 @@
 	tmpusermap="${usermap}.tmp"
 	umask 022
 	if [ -f "$usermap" ]; then
-	        grep -v "digicam" $usermap > $tmpusermap
-	        mv -f $tmpusermap $usermap
+		grep -v "digicam" $usermap > $tmpusermap
+		mv -f $tmpusermap $usermap
 	fi
 	%groupremove digicam
 fi
@@ -232,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/02/27 23:38:50  glen
+- use %service
+
 Revision 1.59  2005/10/19 16:02:37  freetz
 - O: udev-digicam
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hotplug.spec?r1=1.59&r2=1.60&f=u