aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-05-05 14:32:46 -0400
committerBill Nottingham <notting@redhat.com>2010-05-05 14:32:46 -0400
commiteaeb72231350ed442979a7616cf547859a885609 (patch)
treeb0241c5eb683d2db8a76a73f8eb4fb4be8b51270
parentf7c95561214029bdb11de6463da269352474eb2b (diff)
downloadinitscripts-eaeb72231350ed442979a7616cf547859a885609.tar
initscripts-eaeb72231350ed442979a7616cf547859a885609.tar.gz
initscripts-eaeb72231350ed442979a7616cf547859a885609.tar.bz2
initscripts-eaeb72231350ed442979a7616cf547859a885609.tar.xz
initscripts-eaeb72231350ed442979a7616cf547859a885609.zip
-rw-r--r--initscripts.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 9ab340c2..4ae96d6e 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,7 +2,7 @@
Summary: The inittab file and the /etc/init.d scripts
Name: initscripts
-Version: 9.03.6
+Version: 9.03.7
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7
Conflicts: e2fsprogs < 1.15
# http://bugzilla.redhat.com/show_bug.cgi?id=252973
Conflicts: nut < 2.2.0
-Conflicts: NetworkManager < 1:0.8.0
+Conflicts: NetworkManager < 1:0.8.0-12.git20100504
Obsoletes: hotplug <= 3:2004_09_23-10.1
Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, coreutils
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
+* Wed May 5 2010 Bill Nottingham <notting@redhat.com> - 9.03.7-1
+- updates for new NetworkManager commandline syntax
+
* Tue May 4 2010 Bill Nottingham <notting@redhat.com> - 9.03.6-1
- fix plymouth startup/shutdown (#586040)
- fstab-decode.8: tweak manpage so it formats correctly (#586476)