aboutsummaryrefslogtreecommitdiffstats
path: root/initscripts.spec
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-03-03 16:28:14 -0500
committerBill Nottingham <notting@redhat.com>2010-03-03 16:28:14 -0500
commit6a8455a700782b40e474963dc42dda3b1d14fc68 (patch)
tree3cea343c175a973f95ce16c9855497944fbe925a /initscripts.spec
parent3a86ed0b2e6c145ec9cbdf49b36e07b5bb13b36d (diff)
parentbab107339ca07cbbef05ac79bd34b19d8a081fe4 (diff)
downloadinitscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar
initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.gz
initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.bz2
initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.tar.xz
initscripts-6a8455a700782b40e474963dc42dda3b1d14fc68.zip
Merge branch 'nm-integration'
Diffstat (limited to 'initscripts.spec')
-rw-r--r--initscripts.spec1
1 files changed, 1 insertions, 0 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 1d7b5ed3..cbe8aedf 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -40,6 +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
Obsoletes: hotplug <= 3:2004_09_23-10.1
Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, coreutils