xpm to png

4 files changed, 13 insertions, 11 deletions

diff --git a/drakconf.spec b/drakconf.spec
index 6ed17ed3..fef7eb6e 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -2,7 +2,7 @@
 # do not edit here, but in cvs/soft/control-center
 %define name 	drakconf
 %define version 0.90
-%define release 3mdk
+%define release 4mdk
 
 Summary:	The Mandrake Control Center 
 Name:		%{name}
@@ -11,9 +11,9 @@ Release:        %{release}
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%{name}-%{version}.tar.bz2
-Source1:	drakconf16.xpm.bz2
-Source2:	drakconf32.xpm.bz2
-Source3:	drakconf48.xpm.bz2
+Source1:	drakconf16.png.bz2
+Source2:	drakconf32.png.bz2
+Source3:	drakconf48.png.bz2
 License:	GPL
 Group:		System/Configuration/Other
 Url:		http://www.mandrakelinux.com/en/cvs.php3
@@ -66,15 +66,15 @@ cp apps.drakconf  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/mcc
 #install menu
 mkdir -p $RPM_BUILD_ROOT%{_menudir}
 cat > $RPM_BUILD_ROOT%{_menudir}/drakconf << EOF
-?package(%{name}): needs="x11" icon="drakconf.xpm" section="Configuration/Other" title="Mandrake Control Center" longtitle="System configuration tool" command="/usr/X11R6/bin/drakconf"
+?package(%{name}): needs="x11" icon="drakconf.png" section="Configuration/Other" title="Mandrake Control Center" longtitle="System configuration tool" command="/usr/X11R6/bin/drakconf"
 EOF
 
 #install menu icon
 mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
 mkdir -p $RPM_BUILD_ROOT%{_liconsdir}
-bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_miconsdir}/drakconf.xpm
-bzcat %{SOURCE2} > $RPM_BUILD_ROOT%{_iconsdir}/drakconf.xpm
-bzcat %{SOURCE3} > $RPM_BUILD_ROOT%{_liconsdir}/drakconf.xpm
+bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_miconsdir}/drakconf.png
+bzcat %{SOURCE2} > $RPM_BUILD_ROOT%{_iconsdir}/drakconf.png
+bzcat %{SOURCE3} > $RPM_BUILD_ROOT%{_liconsdir}/drakconf.png
 
 %post
 %{update_menus}
@@ -90,10 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_prefix}/X11R6/bin/*
 %{_menudir}/drakconf
-%{_miconsdir}/*.xpm
-%{_iconsdir}/*.xpm
+%{_miconsdir}/*.png
 %{_iconsdir}/*.png
-%{_liconsdir}/*.xpm
+%{_liconsdir}/*.png
 %{_sbindir}/clock.pm
 %{_sbindir}/menus.pm
 %{_sbindir}/print.pm
@@ -105,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/mcc
 
 %changelog
+* Tue Jan 29 2002 dam's <damien@mandrakesoft.com> 0.90-4mdk
+- changed xpm to png.
+
 * Sun Jan 27 2002 Pixel <pixel@mandrakesoft.com> 0.90-3mdk
 - remove logdrake (moved to drakxtools)
 
diff --git a/drakconf16.xpm.bz2 b/drakconf16.xpm.bz2
deleted file mode 100644
index a8e6c3ae..00000000
--- a/drakconf16.xpm.bz2
+++ /dev/null
diff --git a/drakconf32.xpm.bz2 b/drakconf32.xpm.bz2
deleted file mode 100644
index 6474d6b5..00000000
--- a/drakconf32.xpm.bz2
+++ /dev/null
diff --git a/drakconf48.xpm.bz2 b/drakconf48.xpm.bz2
deleted file mode 100644
index aab3ca02..00000000
--- a/drakconf48.xpm.bz2
+++ /dev/null