summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-30 05:57:49 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-30 05:57:49 +0000
commit2c202153438f9a86a1710d57b53422ae5ee757b6 (patch)
tree158a995821be8c33d3a3324dc1f0fc2ad9e1366b
parent1aba1f0da9ff90a14c2d0c250972e9ae9ddd1a19 (diff)
downloaddrakx-2c202153438f9a86a1710d57b53422ae5ee757b6.tar
drakx-2c202153438f9a86a1710d57b53422ae5ee757b6.tar.gz
drakx-2c202153438f9a86a1710d57b53422ae5ee757b6.tar.bz2
drakx-2c202153438f9a86a1710d57b53422ae5ee757b6.tar.xz
drakx-2c202153438f9a86a1710d57b53422ae5ee757b6.zip
split localedrake menu entry in two ones:
- one for user config - one for system (embedded in mcc)
-rw-r--r--perl-install/drakxtools.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 62a93b4e0..aba7cc007 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -8,7 +8,7 @@ License: GPL
Group: System/Configuration/Other
Requires: %{name}-newt = %version-%release, perl-Gtk2 >= 1.040-1mdk, perl-Glib >= 1.040-1mdk, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.63-5mdk, perl-MDK-Common >= 1.1.18-1mdk, gurpmi, mandrake-doc-common >= 9.2-5mdk
Requires: foomatic-db-engine
-Conflicts: drakconf < 10.1-0.1mdk
+Conflicts: drakconf < 10.1-0.6mdk
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
@@ -200,7 +200,15 @@ cat > $RPM_BUILD_ROOT%_menudir/drakxtools-newt <<EOF
?package(drakxtools-newt): \
needs="X11" \
section="System/Configuration/Other" \
- title="LocaleDrake" \
+ title="LocaleDrake (System)" \
+ longtitle="System wide language configurator" \
+ command="/usr/bin/drakconf --start-with=Localization" \
+ icon="localedrake.png"
+
+?package(drakxtools-newt): \
+ needs="X11" \
+ section="System/Configuration/Other" \
+ title="LocaleDrake (User)" \
longtitle="Language configurator" \
command="/usr/bin/localedrake" \
icon="localedrake.png"