rpms/hal/devel hal.spec,1.88,1.89

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Apr 24 15:03:45 UTC 2006


Author: johnp

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

Modified Files:
	hal.spec 
Log Message:
- ifnarch the pm-utils requires for s390 and s390x



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- hal.spec	19 Apr 2006 04:43:31 -0000	1.88
+++ hal.spec	24 Apr 2006 15:03:08 -0000	1.89
@@ -20,7 +20,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 4
+Release: 5 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -48,7 +48,9 @@
 Requires: libselinux >= %{libselinux_version}
 Requires: initscripts >= %{initscripts_version}
 Requires: cryptsetup-luks >= %{cryptsetup_luks_version}
+%ifnarch s390 s390x
 Requires: pm-utils >= %{pm_utils_version}
+%endif 
 Conflicts: kernel < %{kernel_version}
 %ifnarch s390 s390x
 Requires: libusb >= %{libusb_version}
@@ -123,7 +125,7 @@
 /sbin/ldconfig
 #if [ "$1" -ge "1" ]; then
 #  service haldaemon condrestart > /dev/null 2>&1
-#fi
+z#fi
 
 %triggerpostun -- hal < 0.5.7-3
 #remove lingering fstab-sync entries from /etc/fstab
@@ -193,6 +195,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Apr 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-5
+- ifnarch the pm-utils requires for s390 and s390x
+
 * Wed Apr 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-4
 - Add Requires on pm-utils >= 0.10-1 (#185134, Andrew Overholt)
 




More information about the fedora-cvs-commits mailing list