SPECS: hal.spec - cleaned up outdated configure parameters, use ne...

[freetz]

Author: freetz                       Date: Mon Aug  1 17:47:33 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleaned up outdated configure parameters, use new service macros,
  fstab-sync broken (dbus communication problem?), NOT ready for new udev
  madness

---- Files affected:
SPECS:
   hal.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.72 SPECS/hal.spec:1.73
--- SPECS/hal.spec:1.72	Sat Jul 16 20:31:54 2005
+++ SPECS/hal.spec	Mon Aug  1 19:47:27 2005
@@ -48,7 +48,7 @@
 Requires:	mount >= 2.12-14
 %pyrequires_eq	python
 Requires:	python-dbus >= 0.33
-Requires:	udev >= 057
+Requires:	udev <= 058
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -125,10 +125,8 @@
 	%{?with_docs:--enable-docbook-docs} \
 	%{?with_docs:--enable-doxygen-docs} \
 	--enable-fstab-sync \
-	--enable-hotplug-map \
 	--enable-pcmcia-support \
 	--enable-selinux \
-	--enable-sysfs-carrier \
 	--with-hwdata=%{_sysconfdir}
 
 %{__make}
@@ -161,18 +159,11 @@
 
 %post
 /sbin/chkconfig --add haldaemon
-
-if [ -f /var/lock/subsys/haldaemon ]; then
-	/etc/rc.d/init.d/haldaemon restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/haldaemon start\" to start HAL daemon."
-fi
+%service haldaemon restart
 
 %preun
-if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/haldaemon ]; then
-		/etc/rc.d/init.d/haldaemon stop >&2
-	fi
+if [ "$1" = "0" ]; then
+	%service -q haldaemon stop
 	/sbin/chkconfig --del haldaemon
 fi
 
@@ -234,6 +225,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2005/08/01 17:47:27  freetz
+- cleaned up outdated configure parameters, use new service macros,
+  fstab-sync broken (dbus communication problem?), NOT ready for new udev
+  madness
+
 Revision 1.72  2005/07/16 18:31:54  freetz
 - unpackaged files added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.72&r2=1.73&f=u