summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-08 07:44:07 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-08 07:44:07 +0000
commit7b93ab9cfd47d070f1bee40f988a7015c074b8e3 (patch)
tree554e834dff2b3abb39a278094930a7cb2ebda1db
parent19c821c38a98fbde25f012b8f4d5431f8f830018 (diff)
downloaddrakx-7b93ab9cfd47d070f1bee40f988a7015c074b8e3.tar
drakx-7b93ab9cfd47d070f1bee40f988a7015c074b8e3.tar.gz
drakx-7b93ab9cfd47d070f1bee40f988a7015c074b8e3.tar.bz2
drakx-7b93ab9cfd47d070f1bee40f988a7015c074b8e3.tar.xz
drakx-7b93ab9cfd47d070f1bee40f988a7015c074b8e3.zip
bump conflict on drakconf due to blino's changes
-rw-r--r--perl-install/drakxtools.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index f1f831c97..b8c55d2e8 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -9,7 +9,7 @@ Group: System/Configuration/Other
Requires: %{name}-newt = %version-%release, perl-Gtk2 >= 1.072-1mdk, perl-Glib >= 1.072-1mdk, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.63-5mdk, perl-MDK-Common >= 1.1.23, mandrake-doc-common >= 9.2-5mdk
Requires: foomatic-db-engine
Requires: drakconf-icons
-Conflicts: drakconf < 10.1-0.6mdk
+Conflicts: drakconf < 10.3-0.4mdk
Conflicts: rpmdrake < 2.1-29mdk
Conflicts: mandrake_doc-drakxtools-en < 9.2, mandrake_doc-drakxtools-es < 9.2, mandrake_doc-drakxtools-fr < 9.2
Conflicts: bootloader-utils < 1.8-4mdk, bootsplash < 2.1.7-1mdk