diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2002-08-02 16:24:46 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2002-08-02 16:24:46 +0000 |
| commit | 4667774adfa9bfe70b93ca1a55773d40b2d1c4e2 (patch) | |
| tree | 3949f5825abde1c9ff9fb749dca463423acfdd13 | |
| parent | d842ce20e07db424c87f473a799afd2e0614ce1a (diff) | |
| download | control-center-4667774adfa9bfe70b93ca1a55773d40b2d1c4e2.tar control-center-4667774adfa9bfe70b93ca1a55773d40b2d1c4e2.tar.gz control-center-4667774adfa9bfe70b93ca1a55773d40b2d1c4e2.tar.bz2 control-center-4667774adfa9bfe70b93ca1a55773d40b2d1c4e2.tar.xz control-center-4667774adfa9bfe70b93ca1a55773d40b2d1c4e2.zip | |
- rpmdrake added
| -rwxr-xr-x | control-center | 33 | ||||
| -rw-r--r-- | drakconf.spec | 6 |
2 files changed, 27 insertions, 12 deletions
diff --git a/control-center b/control-center index 1d32324d..9b69af96 100755 --- a/control-center +++ b/control-center @@ -81,6 +81,7 @@ my $rc = "$mcc_dir/$theme/gtkrc"; my ($log_check_box, $embedded_check_box); $::isWiz = -e "/usr/sbin/drakwizard"; +$::isRpmDrake = -e "/usr/sbin/rpmdrake"; my $exec_hash = { @@ -108,11 +109,15 @@ my $exec_hash = _("Services") => [ "drakxservices", "$_sbindir/drakxservices", 1 ], _("Fonts") => [ "drakfont", "$_sbindir/drakfont", 1 ], _("Date & Time") => [ "clock", "$_sbindir/clock.pl", 1 ], - _("Software Manager") => [ "rpmdrake", "$_bindir/rpmdrake", -1 ], _("Logs") => [ "logdrake", "$_sbindir/logdrake", 1 ], # little workaround to avoid drakconf freeze #_("Console") => [ "rxvt", "", 0, ["$_xbindir/rxvt", "rxvt", 1] ], _("Console") => [ "rxvt", "$_xbindir/rxvt", -1 ], + _("Install Software") => [ "rpmdrake", "$_sbindir/rpmdrake", -1 ], + _("Remove Software") => [ "rpmdrake", "$_sbindir/rpmdrake-remove", -1 ], + _("Mandrake Update") => [ "rpmdrake", "$_sbindir/MandrakeUpdate", -1 ], + _("Software Sources Manager") => [ "rpmdrake", "$_sbindir/edit-urpm-sources.pl", -1 ], + # _("TV Cards") => [ "drakxtv", "$_sbindir/drakxtv", 1 ], @@ -211,21 +216,29 @@ my @tree = [_("Services") , 'service-mdk'], [_("Fonts"), 'drakfont-mdk'], [_("Date & Time") , 'time-mdk'], - [_("Software Manager"), 'rpmdrake-mdk'], [_("Logs"), 'logdrake-mdk'], [_("Console"), 'console-mdk'], [_("Users"), 'user-mdk'], # [_("RFBDrake"), 'unknown-mdk'], ] ], - if_($::isWiz, - [_("Server Configuration"), 'wizard-mdk', - [ - (map { - if_(-e '/usr/share/wizards/'.$_.'_wizard/'.$_.'.wiz', $wizard{$_}) - } keys %wizard) - ] - ]), + if_($::isRpmDrake, + [_("Software Management"),'software', + [ + [_("Install Software"), 'rpmdrake'], + [_("Remove Software"), 'rpmdrake-remove'], + [_("Mandrake Update"), 'MandrakeUpdate'], + [_("Software Sources Manager"), 'source-manager'], + ] + ]), + if_($::isWiz, + [_("Server Configuration"), 'wizard-mdk', + [ + (map { + if_(-e '/usr/share/wizards/'.$_.'_wizard/'.$_.'.wiz', $wizard{$_}) + } keys %wizard) + ] + ]), ); #------------------------------------------------------------- diff --git a/drakconf.spec b/drakconf.spec index 2c8f2221..e1f3fb7c 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -6,7 +6,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: %version -Release: 0.4mdk +Release: 0.5mdk # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %{name}-%{version}.tar.bz2 @@ -21,7 +21,6 @@ Provides: DrakConf Requires: mandrake-release, drakxtools >= 1.1.8-14mdk, gtk+mdk >= 0.1.6-10mdk Requires: menudrake >= 0.6.5-2mdk, harddrake-ui >= 1.1.8-16mdk Requires: perl-GTK, perl-GTK-GdkImlib, usermode -Requires: drakwizard Requires: popt >= 1.6.3-9mdk Requires: XFree86-100dpi-fonts Requires: rxvt @@ -94,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %_datadir/mcc/kde %changelog +* Fri Aug 2 2002 Damien Chaumette <dchaumette@mandrakesoft.com> 9.0-0.5mdk +- add new rpmdrake + * Thu Aug 1 2002 Damien Chaumette <dchaumette@mandrakesoft.com> 9.0-0.4mdk - fix system/users (thanks tv) - workaround for system/console |