aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mandrake_desk.spec23
-rw-r--r--menu/mandrake_desk8
2 files changed, 24 insertions, 7 deletions
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 62ef9f5..2c2d63a 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,7 +1,7 @@
Summary: The Desktop configuration files for Mandrake Linux
Name: mandrake_desk
Version: 8.2
-Release: 4mdk
+Release: 5mdk
License: GPL
URL: http://www.mandrakelinux.com/
Group: System/Configuration/Other
@@ -100,7 +100,13 @@ rm -rf %buildroot
cd eazel-engine
%makeinstall_std
)
-
+mkdir -p $RPM_BUILD_ROOT{%{_menudir},%{_datadir}/control-center/capplet/Advanced}
+cat << EOF > $RPM_BUILD_ROOT%{_menudir}/mdk-eazel-engine-capplet
+?package(mdk-eazel-engine-capplet):command="%{_bindir}/eazel-engine-capplet" \
+needs="gnome" section="Configuration/Gnome/Advanced" title="Crux GTK+ Theme" \
+longtitle="Configuration applet for Crux GTK+ theme"
+EOF
+cp -f $RPM_BUILD_ROOT%_datadir/gnome/apps/Settings/Desktop/eazel-engine-properties.desktop $RPM_BUILD_ROOT%{_datadir}/control-center/capplet/Advanced
(
cd krootwarning
%makeinstall_std
@@ -178,6 +184,12 @@ fi
%postun -n krozat
%clean_menus
+%post -n mdk-eazel-engine-capplet
+%update_menus
+
+%postun -n mdk-eazel-engine-capplet
+%clean_menus
+
%clean
@@ -265,7 +277,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %_datadir/gnome/apps/Settings/
%dir %_datadir/gnome/apps/Settings/Desktop/
%_datadir/gnome/apps/Settings/Desktop/*.desktop
-
+%{_menudir}/mdk-eazel-engine-capplet
+%{_datadir}/control-center/capplet/Advanced/*
%files -n krootwarning
%defattr(-,root,root,-)
@@ -308,6 +321,10 @@ rm -rf $RPM_BUILD_ROOT
%_menudir/krozat
%changelog
+* Tue Jan 29 2002 Frederic Crozat <fcrozat@mandrakesoft.com> 8.2-5mdk
+- Add link to Crux configuration applet
+- Fix menu entries for simplified menu
+
* Mon Jan 28 2002 Frederic Crozat <fcrozat@mandrakesoft.com> 8.2-4mdk
- New icons for GNOME desktop
diff --git a/menu/mandrake_desk b/menu/mandrake_desk
index 8306d48..abde2e6 100644
--- a/menu/mandrake_desk
+++ b/menu/mandrake_desk
@@ -569,14 +569,14 @@
?package(staroffice-fr): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_fr/program/spadmin" section="Use office tools (Create an office document)"
-?package(staroffice-fr): title="StarOffice, configuration" icon=set52.xpm needs="x11" command="/usr/lib/office52_fr/program/setup" section="Use office tools (Create an office document)"
+?package(staroffice-fr): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_fr/program/setup" section="Use office tools (Create an office document)"
-?package(staroffice-es): title="Esegue il programma StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_es/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-es): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="/usr/lib/office52_es/program/soffice" section="Use office tools (Create an office document)" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
-?package(staroffice-es): title="Configurazione della stampante per StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_es/program/spadmin" section="Use office tools (Create an office document)"
+?package(staroffice-es): title="Configure your printer for StarOffice" icon=psetup.xpm needs="x11" command="/usr/lib/office52_es/program/spadmin" section="Use office tools (Create an office document)"
-?package(staroffice-es): title="Setup di StarOffice" icon=set52.xpm needs="x11" command="/usr/lib/office52_es/program/setup" section="Use office tools (Create an office document)"
+?package(staroffice-es): title="StarOffice Setup" icon=set52.xpm needs="x11" command="/usr/lib/office52_es/program/setup" section="Use office tools (Create an office document)"