From 601fdd54fc32ded4dc50f69b7b883db36a827b8f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Jan 15 2010 20:11:31 +0000
Subject: 9.04-1


---

diff --git a/.cvsignore b/.cvsignore
index 7a2b253..eb5c948 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-initscripts-9.03.tar.bz2
+initscripts-9.04.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index 3bedab1..aebd40e 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,11 +2,11 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.03
+Version: 9.04
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1
+Release: 1%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -31,7 +31,7 @@ Requires: popt >= 1.12-2
 Requires: cpio
 Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
-Conflicts: dhclient < 3.0.3-7
+Conflicts: dhclient < 12:4.1.0-6
 Conflicts: tcsh < 6.13-5
 Conflicts: xorg-x11, glib2 < 2.11.1-2
 Conflicts: alsa-utils < 1.0.18
@@ -243,6 +243,19 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Jan 15 2010 Bill Nottingham <notting@redhat.com> - 9.04-1
+- various shell-related cleanups and optimizations <ville.skytta@iki.fi>
+- ifup-eth: use dhclient's -H option instead of munging dhclient config files
+- rc.sysinit: move mdadm after dmraid (#494821)
+- ifup-eth: use dhclient -6, not the no-longer-included dhcp6c
+- add more man pages (#529328, <plautrba@redhat.com>)
+- move is_wireless after MACADDR/MTU setting (#552638)
+- serial.conf: respawn correctly. (#552324, <zing@fastmail.fm>)
+- network-functions: use sysfs for wireless check (#551019, <adel.gadllah@gmail.com>)
+- reload init on started messagebus (<plautrba@redhat.com>)
+- honor HOTPLUG in ifdown (#547737)
+- network-functions: silence error. (#516569)
+
 * Wed Dec  9 2009 Bill Nottingham <notting@redhat.com> - 9.03-1
 - migrate to upstart 0.6.x (<notting@redhat.com>, <plautrba@redhat.com>)
 -- jobs move to /etc/init
diff --git a/sources b/sources
index f2252b4..a2df53b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-668fa2762b57ef75436303857847bba3  initscripts-9.03.tar.bz2
+83bc133219f626bd652ca88c82df5476  initscripts-9.04.tar.bz2