diff options
| author | Daouda Lo <daouda@mandriva.com> | 2004-08-04 02:24:24 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2004-08-04 02:24:24 +0000 |
| commit | ef8c3b72e9eed2fd0a450751e30baa89ecddde18 (patch) | |
| tree | 6e6b9830bc30ab34bc9696b4291d11b5ac73af0e | |
| parent | 214c56d19acdc4d41bf5a1b63598de570ec119de (diff) | |
| download | mgaonline-ef8c3b72e9eed2fd0a450751e30baa89ecddde18.tar mgaonline-ef8c3b72e9eed2fd0a450751e30baa89ecddde18.tar.gz mgaonline-ef8c3b72e9eed2fd0a450751e30baa89ecddde18.tar.bz2 mgaonline-ef8c3b72e9eed2fd0a450751e30baa89ecddde18.tar.xz mgaonline-ef8c3b72e9eed2fd0a450751e30baa89ecddde18.zip | |
- automatically launch net_applet for KDE, GNOME and IceWM
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mdkonline.spec | 18 |
2 files changed, 17 insertions, 3 deletions
@@ -41,7 +41,7 @@ install: all install -m644 icons/$(NAME)32.png $(ICONSDIR)/$(NAME).png install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png install -m644 pixmaps/*.png $(PIXDIR)/pixmaps - install -m644 mdkapplet.desktop $(PREFIX)/usr/share/autostart/ +# install -m644 mdkapplet.desktop $(PREFIX)/usr/share/autostart/ install -m644 mdkonline.pm $(FBLIBDIR) for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done diff --git a/mdkonline.spec b/mdkonline.spec index 2b9738cc..afacbb04 100644 --- a/mdkonline.spec +++ b/mdkonline.spec @@ -4,7 +4,7 @@ Summary: The MandrakeOnline Tool Name: %{name} Version: %{version} -Release: 5mdk +Release: 6mdk Source0: %{name}-%{version}.tar.bz2 URL: http://www.mandrakeonline.net Packager: Daouda Lo <daouda@mandrakesoft.com> @@ -52,6 +52,17 @@ mkdir -p %buildroot%_prefix/X11R6/bin/ ln -sf %_sbindir/mdkonline %buildroot%_sbindir/drakonline ln -sf %_sbindir/mdkonline %buildroot%_prefix/X11R6/bin/mdkonline +mkdir -p $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d +cat > $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/mdkapplet <<EOF +#!/bin/sh +DESKTOP=$1 +case $DESKTOP in + KDE|GNOME|IceWM) exec /usr/bin/mdkapplet;; +esac +EOF + +chmod +x $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/mdkapplet + #install lang %{find_lang} %{name} @@ -102,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{_iconsdir}/*.png %{_liconsdir}/*.png %{_datadir}/%{name}/pixmaps/*.png -%{_datadir}/autostart/* +#%{_datadir}/autostart/* ################################################################## # @@ -114,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) %changelog +* Wed Aug 4 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-6mdk +- automatically launch mdkapplet for KDE, GNOME and IceWM (via xinit) + * Sat Jul 17 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-5mdk - fix conflicts (fcrozat) |