aboutsummaryrefslogtreecommitdiffstats
path: root/initscripts.spec
diff options
context:
space:
mode:
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 ca590507..4c318678 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -22,6 +22,7 @@ Conflicts: mkinitrd < 4.0, kernel < 2.6.12
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: tcsh < 6.13-5
+Conflicts: xorg-x11
#Conflicts: diskdumputils < 1.1.0
Obsoletes: rhsound sapinit
Obsoletes: hotplug