aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile12
-rw-r--r--gnome/DrakConf.desktop7
-rw-r--r--gnome/RpmDrake.desktop9
-rw-r--r--mandrake_desk.spec9
5 files changed, 32 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index acbfb92..bf36585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-25 Pablo Saratxga <pablo@mandrakesoft.com>
+
+ * Makefile,*.spec,gnome/*.desktop: put the handling of Gnome icons
+ on the Makefile; and added menu entries for DrakeConf and RpmDrake
+
1999-12-24 Chmouel Boudjnah <chmouel@mandrakesoft.com>
* window-managers: various change from jerome.
diff --git a/Makefile b/Makefile
index ad827e7..21edf03 100644
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,13 @@ rpm: dis ../mandrake_desk-$(VERSION).tar.bz2 $(RPM)
install:
mkdir -p $(RPM_BUILD_ROOT)/usr/{bin,sbin}
mkdir -p $(RPM_BUILD_ROOT)/usr/share/{icons,icons/large,icons/mini,pixmaps/backgrounds/mandrake}
- mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet
mkdir -p $(RPM_BUILD_ROOT)/etc/X11/
mkdir -p $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk
mkdir -p $(RPM_BUILD_ROOT)/etc/skel/Desktop
+ mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts
+ mkdir -p $(RPM_BUILD_ROOT)/usr/lib/desktop-links
+ mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet
+ mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/System
install -m755 bin/* $(RPM_BUILD_ROOT)/usr/bin
install -m755 sbin/* $(RPM_BUILD_ROOT)/usr/sbin
install -m644 window-managers $(RPM_BUILD_ROOT)/etc/X11/
@@ -47,3 +50,10 @@ install:
install -m644 icons/mandrake*.xpm $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk/
install -m644 gnome/Netscape.desktop \
$(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet
+ install -m644 gnome/{DrakConf,RpmDrake}.desktop
+ $(RPM_BUILD_ROOT)/usr/share/gnome/apps/System
+ install -m755 gnome/mandrake.links.sh \
+ $RPM_BUILD_ROOT/usr/lib/mc/desktop-scripts
+ install -m644 gnome/mandrake.links \
+ $RPM_BUILD_ROOT/usr/lib/desktop-links
+
diff --git a/gnome/DrakConf.desktop b/gnome/DrakConf.desktop
new file mode 100644
index 0000000..a680efe
--- /dev/null
+++ b/gnome/DrakConf.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=DrakConf
+Icon=DrakConf.xpm
+TryExec=DrakConf;
+Exec=/usr/bin/kdesu -c "/usr/X11R6/bin/DrakConf"
+Terminal=0
+Type=Application
diff --git a/gnome/RpmDrake.desktop b/gnome/RpmDrake.desktop
new file mode 100644
index 0000000..f12eb51
--- /dev/null
+++ b/gnome/RpmDrake.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=RpmDrake
+Exec=/usr/X11R6/bin/rpmdrake
+Icon=rpmdrake.xpm
+TryExec=/usr/X11R6/bin/rpmdrake
+Exec=/usr/X11R6/bin/rpmdrake
+Terminal=0
+Type=Application
+
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 16c152c..0cf04b7 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -36,15 +36,6 @@ pushd $RPM_BUILD_ROOT/usr/share/pixmaps/backgrounds/mandrake && {
} && popd
rm -f special/mandrake-small.xpm
-mkdir -p $RPM_BUILD_ROOT/usr/lib/mc/desktop-scripts
-install -m 755 gnome/mandrake.links.sh \
- $RPM_BUILD_ROOT/usr/lib/mc/desktop-scripts/mandrake.links.sh
-
-mkdir -p $RPM_BUILD_ROOT/usr/lib/desktop-links
-install -m 644 gnome/mandrake.links \
- $RPM_BUILD_ROOT/usr/lib/desktop-links/mandrake.links
-
-
%clean
rm -rf $RPM_BUILD_ROOT