From 3cee10fd2905ac74e15f6d07d20d328d899c785e Mon Sep 17 00:00:00 2001
From: David Baudens <baudens@mandriva.com>
Date: Thu, 18 Mar 2004 20:42:34 +0000
Subject: Add icons for localedrake menu entry

---
 perl-install/Makefile.drakxtools                 |   3 +++
 perl-install/drakxtools.spec                     |  21 ++++++++++++++-------
 perl-install/standalone/icons/localedrake-16.png | Bin 0 -> 1327 bytes
 perl-install/standalone/icons/localedrake-32.png | Bin 0 -> 1991 bytes
 perl-install/standalone/icons/localedrake-48.png | Bin 0 -> 3087 bytes
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 perl-install/standalone/icons/localedrake-16.png
 create mode 100644 perl-install/standalone/icons/localedrake-32.png
 create mode 100644 perl-install/standalone/icons/localedrake-48.png

(limited to 'perl-install')

diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 640bed021..2359df995 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -56,6 +56,9 @@ install:
 	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu32.png $(ICONSDIR)/harddrake.png
 	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu48.png $(ICONSDIR)/large/harddrake.png
 	mv $(LIBDEST)/icons/harddrake2/menu/harddrake-menu16.png $(ICONSDIR)/mini/harddrake.png
+	mv $(LIBDEST)/icons/localedrake-32.png $(ICONSDIR)/localedrake.png
+	mv $(LIBDEST)/icons/localedrake-48.png $(ICONSDIR)/large/localedrake.png
+	mv $(LIBDEST)/icons/localedrake-16.png $(ICONSDIR)/mini/localedrake.png
 	rmdir $(LIBDEST)/icons/harddrake2/menu
 	mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
 	mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 378123e74..14b7ca269 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
 Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
 Name:    drakxtools
 Version: 10
-Release: 24mdk
+Release: 25mdk
 Url: http://www.mandrakelinux.com/en/drakx.php3
 Source0: %name-%version.tar.bz2
 License: GPL
@@ -182,12 +182,13 @@ perl -ni -e '/http/ ? print STDERR $_ : print' %{name}.list 2> %{name}-http.list
 mkdir -p $RPM_BUILD_ROOT/%_menudir
 
 cat > $RPM_BUILD_ROOT%_menudir/drakxtools-newt <<EOF
-?package(drakxtools-newt):\
-	needs="X11"\
-	section="Configuration/Other"\
-	title="LocaleDrake"\
-	longtitle="Language configurator"\
-	command="/usr/bin/localedrake"\
+?package(drakxtools-newt): \
+	needs="X11" \
+	section="System/Configuration/Other" \
+	title="LocaleDrake" \
+	longtitle="Language configurator" \
+	command="/usr/bin/localedrake" \
+	icon="localedrake.png"
 
 EOF
  
@@ -280,6 +281,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
 %_menudir/drakxtools-newt
 %doc diskdrake/diskdrake.html
 %attr(4755,root,root) %_sbindir/fileshareset
+%_iconsdir/localedrake.png
+%_iconsdir/large/localedrake.png
+%_iconsdir/mini/localedrake.png
 
 %files -f %{name}-gtk.list
 %defattr(-,root,root)
@@ -317,6 +321,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
 %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
 
 %changelog
+* Thu Mar 18 2004 David Baudens <baudens@mandrakesoft.com> 10-25mdk
+- Add missing icons for localedrake menu entry
+
 * Wed Mar 17 2004 Thierry Vignaud <tvignaud@mandrakesoft.com> 10-24mdk
 - set window icon
 - diskdrake: (pixel)
diff --git a/perl-install/standalone/icons/localedrake-16.png b/perl-install/standalone/icons/localedrake-16.png
new file mode 100644
index 000000000..5cc46f71e
Binary files /dev/null and b/perl-install/standalone/icons/localedrake-16.png differ
diff --git a/perl-install/standalone/icons/localedrake-32.png b/perl-install/standalone/icons/localedrake-32.png
new file mode 100644
index 000000000..145781168
Binary files /dev/null and b/perl-install/standalone/icons/localedrake-32.png differ
diff --git a/perl-install/standalone/icons/localedrake-48.png b/perl-install/standalone/icons/localedrake-48.png
new file mode 100644
index 000000000..df32f35d6
Binary files /dev/null and b/perl-install/standalone/icons/localedrake-48.png differ
-- 
cgit v1.2.1