Fix icons for GNOME Desktop

19 files changed, 28 insertions, 38 deletions

diff --git a/gnome/gnome-Documentation-de.desktop b/gnome/gnome-Documentation-de.desktop
index 5f4037d..fc57ffe 100644
--- a/gnome/gnome-Documentation-de.desktop
+++ b/gnome/gnome-Documentation-de.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Documentation
-Icon=documentation_section.xpm
+Icon=gnome-documentation.png
 Exec=$HELP_BROWSER /usr/share/doc/mandrake/de/index.html 
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-Documentation-en.desktop b/gnome/gnome-Documentation-en.desktop
index 54105cf..480c9aa 100644
--- a/gnome/gnome-Documentation-en.desktop
+++ b/gnome/gnome-Documentation-en.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Documentation
-Icon=documentation_section.xpm
+Icon=gnome-documentation.png
 Exec=$HELP_BROWSER /usr/share/doc/mandrake/en/index.html 
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-Documentation-es.desktop b/gnome/gnome-Documentation-es.desktop
index 75fb29a..afb772e 100644
--- a/gnome/gnome-Documentation-es.desktop
+++ b/gnome/gnome-Documentation-es.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Documentation
-Icon=/usr/share/icons/documentation_section.xpm
+Icon=gnome-documentation.png
 Exec=$HELP_BROWSER /usr/share/doc/mandrake/es/index.html 
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-Documentation-fr.desktop b/gnome/gnome-Documentation-fr.desktop
index e67e288..995a8a5 100644
--- a/gnome/gnome-Documentation-fr.desktop
+++ b/gnome/gnome-Documentation-fr.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Documentation
-Icon=documentation_section.xpm
+Icon=gnome-documentation.png
 Exec=$HELP_BROWSER /usr/share/doc/mandrake/fr/index.html 
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-Documentation-it.desktop b/gnome/gnome-Documentation-it.desktop
index 2d00527..acfb3ff 100644
--- a/gnome/gnome-Documentation-it.desktop
+++ b/gnome/gnome-Documentation-it.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Documentation
-Icon=documentation_section.xpm
+Icon=gnome-documentation.png
 Exec=$HELP_BROWSER /usr/share/doc/mandrake/it/index.html 
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-Internet.desktop b/gnome/gnome-Internet.desktop
index 9aa1c51..b505423 100644
--- a/gnome/gnome-Internet.desktop
+++ b/gnome/gnome-Internet.desktop
@@ -2,7 +2,7 @@
 [Desktop Entry]
 Name=Internet
 Exec=/usr/bin/gnomedesktop-network 
-Icon=networking_www_section.png
+Icon=gnome-internet.png
 Terminal=false
 MultipleArgs=false
 Type=Application
diff --git a/gnome/gnome-documentation.png b/gnome/gnome-documentation.png
new file mode 100644
index 0000000..305ec6b
--- /dev/null
+++ b/gnome/gnome-documentation.png
diff --git a/gnome/gnome-internet.png b/gnome/gnome-internet.png
new file mode 100644
index 0000000..c94fd19
--- /dev/null
+++ b/gnome/gnome-internet.png
diff --git a/gnome/gnome-mandrake-campus.desktop b/gnome/gnome-mandrake-campus.desktop
deleted file mode 100644
index 4e2ca31..0000000
--- a/gnome/gnome-mandrake-campus.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[Desktop Entry]
-Name=Mandrake Campus
-Icon=/usr/share/pixmaps/mc/mandrakecampus.xpm
-URL=http://www.mandrakecampus.com/
-Terminal=false
-MultipleArgs=false
-Type=Link
diff --git a/gnome/gnome-mandrake-control-center.desktop b/gnome/gnome-mandrake-control-center.desktop
index 9321d8e..3f1b18d 100644
--- a/gnome/gnome-mandrake-control-center.desktop
+++ b/gnome/gnome-mandrake-control-center.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Mandrake Control Center
-Icon=drakconf.xpm
+Icon=gnome-mcc.png
 Exec=/usr/X11R6/bin/DrakConf
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-mandrake-expert.desktop b/gnome/gnome-mandrake-expert.desktop
index bf6cd1c..0cd6285 100644
--- a/gnome/gnome-mandrake-expert.desktop
+++ b/gnome/gnome-mandrake-expert.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Mandrake Expert
-Icon=/usr/share/pixmaps/mc/mandrakeexpert.xpm
+Icon=gnome-mandrakeexpert.png
 Exec=http://www.mandrakeexpert.com/
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-mandrake-news.desktop b/gnome/gnome-mandrake-news.desktop
index 0f63cfb..59c3d5b 100644
--- a/gnome/gnome-mandrake-news.desktop
+++ b/gnome/gnome-mandrake-news.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Mandrake News
-Icon=/usr/share/pixmaps/mc/mandrakenews.xpm
+Icon=gnome-mandrakenews.png
 Exec=http://www.mandrakesoft.com/community/mandrakesoftnews
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-mandrake-store.desktop b/gnome/gnome-mandrake-store.desktop
index c103482..25c7142 100644
--- a/gnome/gnome-mandrake-store.desktop
+++ b/gnome/gnome-mandrake-store.desktop
@@ -1,7 +1,7 @@
 
 [Desktop Entry]
 Name=Mandrake Store
-Icon=/usr/share/pixmaps/mc/mandrakestore.xpm
+Icon=gnome-mandrakestore.png
 Exec=http://www.mandrakestore.com/
 Terminal=false
 MultipleArgs=false
diff --git a/gnome/gnome-mandrakeexpert.png b/gnome/gnome-mandrakeexpert.png
new file mode 100644
index 0000000..16e8651
--- /dev/null
+++ b/gnome/gnome-mandrakeexpert.png
diff --git a/gnome/gnome-mandrakenews.png b/gnome/gnome-mandrakenews.png
new file mode 100644
index 0000000..a702444
--- /dev/null
+++ b/gnome/gnome-mandrakenews.png
diff --git a/gnome/gnome-mandrakeonline.png b/gnome/gnome-mandrakeonline.png
new file mode 100644
index 0000000..c21aae8
--- /dev/null
+++ b/gnome/gnome-mandrakeonline.png
diff --git a/gnome/gnome-mandrakestore.png b/gnome/gnome-mandrakestore.png
new file mode 100644
index 0000000..a5867a5
--- /dev/null
+++ b/gnome/gnome-mandrakestore.png
diff --git a/gnome/gnome-mcc.png b/gnome/gnome-mcc.png
new file mode 100644
index 0000000..50ca731
--- /dev/null
+++ b/gnome/gnome-mcc.png
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 98bdd7a..62ef9f5 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:	3mdk
+Release:	4mdk
 License:	GPL
 URL:		http://www.mandrakelinux.com/
 Group:		System/Configuration/Other
@@ -136,26 +136,22 @@ done
 mkdir -p $RPM_BUILD_ROOT%_libdir/mc/desktop-scripts
 cp gnome/mandrake.links.sh $RPM_BUILD_ROOT%_libdir/mc/desktop-scripts/mandrake.links.sh
 chmod 0755 $RPM_BUILD_ROOT%_libdir/mc/desktop-scripts/mandrake.links.sh
-#install -m644 gnome/gnome-mandrake-campus.desktop "%buildroot/%_datadir/mdk/gnome-desktop/Mandrake Campus.desktop"
-install -m644 gnome/gnome-mandrake-control-center.desktop "%buildroot/%_datadir/mdk/gnome-desktop/Mandrake Control Center.desktop"
-install -m644 gnome/gnome-mandrake-expert.desktop "%buildroot/%_datadir/mdk/gnome-desktop/Mandrake Expert.desktop"
-install -m644 gnome/gnome-mandrake-news.desktop "%buildroot/%_datadir/mdk/gnome-desktop/Mandrake News.desktop"
-install -m644 gnome/gnome-mandrake-store.desktop "%buildroot/%_datadir/mdk/gnome-desktop/Mandrake Store.desktop"
-install -m644 gnome/gnome-Internet.desktop %buildroot/%_datadir/mdk/gnome-desktop/Connection-to-Internet.desktop
+install -m644 gnome/gnome-mandrake-control-center.desktop %buildroot/%_datadir/mdk/gnome-desktop
+install -m644 gnome/gnome-mandrake-expert.desktop %buildroot/%_datadir/mdk/gnome-desktop
+install -m644 gnome/gnome-mandrake-news.desktop %buildroot/%_datadir/mdk/gnome-desktop
+install -m644 gnome/gnome-mandrake-store.desktop %buildroot/%_datadir/mdk/gnome-desktop
+install -m644 gnome/gnome-Internet.desktop %buildroot/%_datadir/mdk/gnome-desktop
 
 mkdir -p $RPM_BUILD_ROOT%_datadir/nautilus/default-desktop
-install -m644 gnome/gnome-mandrake-control-center.desktop "%buildroot/%_datadir/nautilus/default-desktop/Mandrake Control Center.desktop"
-install -m644 gnome/gnome-mandrake-expert.desktop "%buildroot/%_datadir/nautilus/default-desktop/Mandrake Expert.desktop"
-install -m644 gnome/gnome-mandrake-news.desktop "%buildroot/%_datadir/nautilus/default-desktop/Mandrake News.desktop"
-install -m644 gnome/gnome-mandrake-store.desktop "%buildroot/%_datadir/nautilus/default-desktop/Mandrake Store.desktop"
-install -m644 gnome/gnome-Internet.desktop %buildroot/%_datadir/nautilus/default-desktop/Connection-to-Internet.desktop
+install -m644 gnome/gnome-mandrake-control-center.desktop %buildroot/%_datadir/nautilus/default-desktop
+install -m644 gnome/gnome-mandrake-expert.desktop %buildroot/%_datadir/nautilus/default-desktop
+install -m644 gnome/gnome-mandrake-news.desktop %buildroot/%_datadir/nautilus/default-desktop
+install -m644 gnome/gnome-mandrake-store.desktop %buildroot/%_datadir/nautilus/default-desktop
+install -m644 gnome/gnome-Internet.desktop %buildroot/%_datadir/nautilus/default-desktop
 
 
-install -d %buildroot/%_datadir/pixmaps/mc/
-install -m644 gnome/gnome-mandrakecampus.xpm %buildroot/%_datadir/pixmaps/mc/mandrakecampus.xpm
-install -m644 gnome/gnome-mandrakeexpert.xpm %buildroot/%_datadir/pixmaps/mc/mandrakeexpert.xpm
-install -m644 gnome/gnome-mandrakenews.xpm %buildroot/%_datadir/pixmaps/mc/mandrakenews.xpm
-install -m644 gnome/gnome-mandrakestore.xpm %buildroot/%_datadir/pixmaps/mc/mandrakestore.xpm
+install -d %buildroot/%_datadir/pixmaps
+install -m644 gnome/*.png %buildroot/%_datadir/pixmaps
 
 install -m755 gnome/gnomedesktop-network %buildroot/%_bindir
 
@@ -236,11 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %_datadir/pixmaps/backgrounds/linux-mandrake/
 %_datadir/pixmaps/backgrounds/linux-mandrake/*
 #
-%dir %_datadir/pixmaps/mc/
-%_datadir/pixmaps/mc/*
-#
+
 %dir %_datadir/pixmaps/mdk/
 %_datadir/pixmaps/mdk/*
+%_datadir/pixmaps/*.png
 #
 %_menudir/simplified/mandrake_desk
 
@@ -313,6 +308,9 @@ rm -rf $RPM_BUILD_ROOT
 %_menudir/krozat
 
 %changelog
+* Mon Jan 28 2002 Frederic Crozat <fcrozat@mandrakesoft.com> 8.2-4mdk
+- New icons for GNOME desktop
+
 * Sun Jan 27 2002 Stefan van der Eijk <stefan@eijk.nu> 8.2-3mdk
 - BuildRequires