rpms/hal/devel hal-change-priority.patch, NONE, 1.1 hal.spec, 1.154, 1.155

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24508

Modified Files:
	hal.spec 
Added Files:
	hal-change-priority.patch 
Log Message:
Adjust start/stop priority for use by NM

Move patches together in the spec file


hal-change-priority.patch:

--- NEW FILE hal-change-priority.patch ---
diff -up hal-0.5.11rc2/hald/haldaemon.in.foo hal-0.5.11rc2/hald/haldaemon.in
--- hal-0.5.11rc2/hald/haldaemon.in.foo	2008-04-17 14:47:24.000000000 -0400
+++ hal-0.5.11rc2/hald/haldaemon.in	2008-04-17 14:47:36.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # haldaemon:   HAL daemon
 #
-# chkconfig: 345 98 02
+# chkconfig: 345 26 74
 # description:  This is a daemon for collecting and maintaing information \
 #               about hardware from several sources. \
 #               See http://www.freedesktop.org/Software/hal


Index: hal.spec
===================================================================
RCS file: /cvs/extras/rpms/hal/devel/hal.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- hal.spec	7 Apr 2008 17:59:16 -0000	1.154
+++ hal.spec	17 Apr 2008 18:57:31 -0000	1.155
@@ -26,10 +26,12 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.11
-Release: 0.5.rc2%{?dist}
+Release: 0.6.rc2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc2.tar.gz
 Patch1: hal-0.5.10-set-property-direct.patch
+Patch2: hal-0.5.11-remove-at-console.patch
+Patch3: hal-change-priority.patch
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -88,7 +90,6 @@
 Obsoletes: %{name} < 0.5.9-1
 Obsoletes: %{name}-gnome
 
-Patch2: hal-0.5.11-remove-at-console.patch
 BuildRequires: autoconf, automake, libtool
 
 %description
@@ -126,6 +127,7 @@
 %setup -q -n %{name}-%{version}rc2
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .no-at-console
+%patch3 -p1 -b .priority
 
 %build
 autoreconf
@@ -270,6 +272,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Thu Apr 17 2008 Bill Nottingham <notting at redhat.com> - 0.5.11-0.6.rc2
+- Adjust start/stop priority earlier for use by NetworkManager (#441658)
+
 * Mon Apr  7 2008 David Zeuthen <davidz at redhat.com> - 0.5.11-0.5.rc2
 - Rebuild