diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-10 09:19:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-10 09:19:23 +0000 |
| commit | c045399593723666be69f7094d3b6b3a4e030458 (patch) | |
| tree | 9a210513e563574e613e8f782856c60078dc9a1a | |
| parent | 7f5ccd6ad7a539ec6b6fc65ba121cc8abd1d850f (diff) | |
| download | control-center-c045399593723666be69f7094d3b6b3a4e030458.tar control-center-c045399593723666be69f7094d3b6b3a4e030458.tar.gz control-center-c045399593723666be69f7094d3b6b3a4e030458.tar.bz2 control-center-c045399593723666be69f7094d3b6b3a4e030458.tar.xz control-center-c045399593723666be69f7094d3b6b3a4e030458.zip | |
embed userdrake again
| -rwxr-xr-x | control-center | 7 | ||||
| -rw-r--r-- | drakconf.spec | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/control-center b/control-center index ee2647b8..bdcfa736 100755 --- a/control-center +++ b/control-center @@ -136,12 +136,7 @@ my $exec_hash = "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("DrakXServices helps you enable or disable services") ], "Software Sources Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("Software Sources Manager helps you define where software packages are downloaded from") ], "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("DrakxTV helps you set up your TV card") ], - # userdrake intercept and ignore SIG_TERM, thus do not properly detach from mcc - # proper fix #1: userdrake do not ignore SIG_TERM when argv contains --embedded - # proper fix #2: wait for plug destruction that results from app - # killing or explicitely destroy it if needed - # instead of relying on app exit - "Users" => [ "userdrake", "$bindir/userdrake", -1, N("UserDrake helps you add, remove or change users of your system") ], + "Users" => [ "userdrake", "$bindir/userdrake", 1, N("UserDrake helps you add, remove or change users of your system") ], "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("Set WebDAV mount points") ], }; diff --git a/drakconf.spec b/drakconf.spec index f63e2db1..7fd3484f 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -4,7 +4,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: 9.2 -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,7 @@ Requires: mandrake-release, drakxtools >= 9.2-0.9mdk Requires: harddrake-ui >= 9.1-31mdk, popt >= 1.6.4-24mdk, usermode Requires: perl-Gtk2 >= 0.26.cvs.2003.07.09.1-2mdk Requires: gtk+2.0 >= 2.2.0-3mdk, perl-MDK-Common => 1.0.4-16mdk -Requires: drakcronat >= 0.1.3-1mdk, menudrake >= 0.7.2-1mdk, rxvt, userdrake +Requires: drakcronat >= 0.1.3-1mdk, menudrake >= 0.7.2-1mdk, rxvt, userdrake => 0.92-6mdk BuildRoot: %_tmppath/%name-%version-buildroot %description @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 10 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.2-0.5mdk +- embed userdrake again + * Wed Jul 9 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.2-0.4mdk - switch to gtk2-perl-xs - flip images for rtl languages (aka hebrew, arab) |