rpms/hal/devel hal.spec,1.85,1.86

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22406

Modified Files:
	hal.spec 
Log Message:
- clear out fstab of all fstab-sync entries if previous hal < 0.5.7-2




Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- hal.spec	24 Feb 2006 17:17:34 -0000	1.85
+++ hal.spec	2 Mar 2006 21:37:03 -0000	1.86
@@ -19,7 +19,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 1
+Release: 2 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -123,6 +123,15 @@
 #  service haldaemon condrestart > /dev/null 2>&1
 #fi
 
+%triggerpostun -- hal < 0.5.7-2
+#remove lingering fstab-sync entries from /etc/fstab
+/bin/cp -f /etc/fstab /etc/fstab.hal-save
+while read line; do echo $line | awk '{print $4}' | grep -q managed || echo $line | grep -q "^#.*fstab-sync" || echo $line; done < /etc/fstab > fstab.replace
+
+if [ -s fstab.replace ]; then
+  /bin/cp -f fstab.replace /etc/fstab
+fi
+
 %files
 %defattr(-,root,root)
 #%doc COPYING ChangeLog NEWS
@@ -181,6 +190,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Thu Mar 02 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-2
+- clear out fstab of all fstab-sync entries if previous hal < 0.5.7-2
+
 * Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-1
 - New upstream version 0.5.7 with several bug fixes
 - Don't restart hald on package upgrade