SPECS: zaptel.spec - use %service, fix deps; rel 2

[glen]

Author: glen                         Date: Fri May 19 21:20:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fix deps; rel 2

---- Files affected:
SPECS:
   zaptel.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.60 SPECS/zaptel.spec:1.61
--- SPECS/zaptel.spec:1.60	Wed Apr 12 14:15:40 2006
+++ SPECS/zaptel.spec	Fri May 19 23:19:58 2006
@@ -10,7 +10,7 @@
 %undefine	with_smp
 %endif
 #
-%define		_rel	1
+%define		_rel	2
 Summary:	Zaptel telephony device support
 Summary(pl):	Obsługa urządzeń telefonicznych Zaptel
 Name:		zaptel
@@ -29,7 +29,7 @@
 BuildRequires:	kernel-module-build
 %endif
 BuildRequires:	newt-devel
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,9 +67,8 @@
 Summary(pl):	Skrypty inicjalizujące Zaptel
 Group:		Applications/Communications
 Requires(post,preun):	/sbin/chkconfig
-Requires(pre):	/bin/id
-Requires(pre):	sh-utils
 Requires:	%{name}-utils = %{version}-%{_rel}
+Requires:	rc-scripts
 
 %description init
 Zaptel boot-time initialization.
@@ -168,7 +167,7 @@
 %endif
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT{/sbin,/usr/include/linux,/etc/{rc.d/init.d,sysconfig},%{_sbindir},%{_mandir}/{man1,man8}}
+install -d $RPM_BUILD_ROOT{/sbin,%{_includedir}/linux,/etc/{rc.d/init.d,sysconfig},%{_sbindir},%{_mandir}/{man1,man8}}
 %{__make} -o all -o devices install \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT \
 	MODCONF=$RPM_BUILD_ROOT/etc/modprobe.conf
@@ -195,17 +194,11 @@
 %if %{with userspace}
 %post init
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to initialize %{name}."
-fi
+%service %{name} restart
 
 %preun init
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop 1>&2
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -251,6 +244,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/05/19 21:19:58  glen
+- use %service, fix deps; rel 2
+
 Revision 1.60  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

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