diff options
| -rw-r--r-- | data/rpmdrake-browse-only.desktop.in | 8 | ||||
| -rw-r--r-- | data/rpmdrake-remove.desktop.in | 4 | ||||
| -rw-r--r-- | data/rpmdrake.desktop.in | 2 | ||||
| -rwxr-xr-x | rpmdrake | 2 | ||||
| -rw-r--r-- | rpmdrake.spec | 6 |
5 files changed, 17 insertions, 5 deletions
diff --git a/data/rpmdrake-browse-only.desktop.in b/data/rpmdrake-browse-only.desktop.in new file mode 100644 index 00000000..ecef2daf --- /dev/null +++ b/data/rpmdrake-browse-only.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Browse Available Software +Icon=/usr/share/mcc/themes/default/rpmdrake.png +Exec=/usr/sbin/rpmdrake +Terminal=0 +Type=Application +Categories=System;SystemSetup;X-Mandrake-SoftwareManagement
\ No newline at end of file diff --git a/data/rpmdrake-remove.desktop.in b/data/rpmdrake-remove.desktop.in index 79e6fe05..7fa7af2c 100644 --- a/data/rpmdrake-remove.desktop.in +++ b/data/rpmdrake-remove.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] _Name=Remove Software Icon=/usr/share/mcc/themes/default/rpmdrake-remove.png -Exec=/usr/sbin/rpmdrake-remove -TryExec=/usr/sbin/rpmdrake-remove +Exec=/usr/sbin/rpmdrake-remove --root +TryExec=/usr/sbin/rpmdrake-remove --root Terminal=0 Type=Application Categories=System;SystemSetup;X-Mandrake-SoftwareManagement
\ No newline at end of file diff --git a/data/rpmdrake.desktop.in b/data/rpmdrake.desktop.in index 35bbb5ed..ca1b33d6 100644 --- a/data/rpmdrake.desktop.in +++ b/data/rpmdrake.desktop.in @@ -2,7 +2,7 @@ Encoding=UTF-8 _Name=Install Software Icon=/usr/share/mcc/themes/default/rpmdrake.png -Exec=/usr/sbin/rpmdrake +Exec=/usr/sbin/rpmdrake --root Terminal=0 Type=Application Categories=System;SystemSetup;X-Mandrake-SoftwareManagement
\ No newline at end of file @@ -52,7 +52,7 @@ $MODE = 'install'; $0 =~ m|/rpmdrake-remove$| and $MODE = 'remove'; $0 =~ m|/MandrakeUpdate$| and $MODE = 'update'; -$MODE eq 'update' and require_root_capability(); +$MODE eq 'update' || "@ARGV" =~ /--root/ and require_root_capability(); eval { require ugtk2; ugtk2->import(qw(:all)); require Gtk2::Pango; require Gtk2::Gdk::Keysyms }; diff --git a/rpmdrake.spec b/rpmdrake.spec index 1ee67489..bc3927e5 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -52,8 +52,10 @@ install -m 644 rpmdrake.pm $RPM_BUILD_ROOT/%{perl_vendorlib} mkdir -p $RPM_BUILD_ROOT%{_menudir} cat > $RPM_BUILD_ROOT%{_menudir}/%{name} << EOF ?package(%{name}): command="/usr/sbin/rpmdrake" needs="x11" section="Configuration/Packaging" icon="rpmdrake.png" \ +title="Browse Available Software" longtitle="A graphical front end for browsing available packages for installation" +?package(%{name}): command="/usr/sbin/rpmdrake --root" needs="x11" section="Configuration/Packaging" icon="rpmdrake.png" \ title="Install Software" longtitle="A graphical front end for installing packages" -?package(%{name}): command="/usr/sbin/rpmdrake-remove" needs="x11" section="Configuration/Packaging" icon="rpmdrake-remove.png" \ +?package(%{name}): command="/usr/sbin/rpmdrake-remove --root" needs="x11" section="Configuration/Packaging" icon="rpmdrake-remove.png" \ title="Remove Software" longtitle="A graphical front end for removing packages" ?package(%{name}): command="/usr/sbin/MandrakeUpdate" needs="x11" section="Configuration/Packaging" icon="mandrakeupdate.png" \ title="Mandrake Update" longtitle="A graphical front end for software updates" @@ -100,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Aug 5 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-31mdk +- require root capability when run "Install Sofware" and add a new + menu entry reading "Browse Available Software" - s/Medias/Media/ in the program name of the menu entry * Mon Aug 4 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-30mdk |