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

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 3 18:48:30 UTC 2006


Author: johnp

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

Modified Files:
	hal.spec 
Log Message:
- Fix fstab clearing script to not strip whitespace




Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- hal.spec	2 Mar 2006 21:37:03 -0000	1.86
+++ hal.spec	3 Mar 2006 18:48:27 -0000	1.87
@@ -19,7 +19,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 2 
+Release: 3 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -123,10 +123,11 @@
 #  service haldaemon condrestart > /dev/null 2>&1
 #fi
 
-%triggerpostun -- hal < 0.5.7-2
+%triggerpostun -- hal < 0.5.7-3
 #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
+(IFS="
+"; 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
@@ -190,6 +191,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Fri Mar 03 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3
+- Fix fstab clearing script to not strip whitespace
+
 * 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
 




More information about the fedora-cvs-commits mailing list