[gnomebaker] Add more icon sizes; fixes the wrong icon size in Xfce menu

[Tomas Smetana]

commit edccb5a37ca18aa399ae834db17fa91018a927ba
Author: Tomas Smetana <tsmetana at redhat.com>
Date:   Tue Oct 16 13:10:28 2012 +0200

    Add more icon sizes; fixes the wrong icon size in Xfce menu

 gnomebaker-0.6.4-iconname.patch |   12 +++++++++++
 gnomebaker.spec                 |   40 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)
---
diff --git a/gnomebaker-0.6.4-iconname.patch b/gnomebaker-0.6.4-iconname.patch
new file mode 100644
index 0000000..31e95e6
--- /dev/null
+++ b/gnomebaker-0.6.4-iconname.patch
@@ -0,0 +1,12 @@
+diff -up gnomebaker-0.6.4/gnomebaker.desktop.in.iconname gnomebaker-0.6.4/gnomebaker.desktop.in
+--- gnomebaker-0.6.4/gnomebaker.desktop.in.iconname	2012-10-16 13:01:30.393000000 +0200
++++ gnomebaker-0.6.4/gnomebaker.desktop.in	2012-10-16 13:01:39.935000000 +0200
+@@ -11,7 +11,7 @@ GenericName[da]=CD/DVD-brændeprogram
+ GenericName[lt]=CD/DVD įrašymas ir kopijavimas
+ GenericName[pt_BR]=Gravador de CD/DVD
+ Exec=gnomebaker
+-Icon=gnomebaker-48
++Icon=gnomebaker
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
diff --git a/gnomebaker.spec b/gnomebaker.spec
index 973d5e1..b7ba0e0 100644
--- a/gnomebaker.spec
+++ b/gnomebaker.spec
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -16,6 +16,7 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 BuildRequires:	desktop-file-utils
 BuildRequires:	intltool
+BuildRequires:	ImageMagick
 
 Requires:	dvd+rw-tools
 Requires:	wodim => 1.1.6
@@ -31,6 +32,7 @@ Patch0: gnomebaker-0.6.4-mimetype.patch
 Patch1: gnomebaker-0.6.4-nograce.patch
 Patch2: gnomebaker-0.6.4-seldata.patch
 Patch3: gnomebaker-0.6.4-ldadd.patch
+Patch4: gnomebaker-0.6.4-iconname.patch
 
 %description
 CD/DVD burner designed for the GNOME desktop.
@@ -42,6 +44,7 @@ CD/DVD burner designed for the GNOME desktop.
 %patch1 -p1 -b .nograce
 %patch2 -p1 -b .seldata
 %patch3 -p1 -b .ldadd
+%patch4 -p1 -b .iconname
 chmod 644 AUTHORS TODO
 
 
@@ -50,6 +53,15 @@ export LDFLAGS="-export-dynamic"
 %configure --enable-libnotify=no
 make %{?_smp_mflags}
 
+# The icon in pixmaps dir is actually 100x100 and Xfce doesn't scale it well
+mv pixmaps/gnomebaker-48.png pixmaps/gnomebaker-100.png
+convert -scale 16x16 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-16.png
+convert -scale 24x24 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-24.png
+convert -scale 32x32 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-32.png
+convert -scale 48x48 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-48.png
+convert -scale 64x64 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-64.png
+convert -scale 72x72 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-72.png
+convert -scale 96x96 pixmaps/gnomebaker-100.png pixmaps/gnomebaker-96.png
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,6 +75,21 @@ desktop-file-install --vendor fedora --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+install -D pixmaps/gnomebaker-16.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -D pixmaps/gnomebaker-24.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -D pixmaps/gnomebaker-32.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -D pixmaps/gnomebaker-48.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -D pixmaps/gnomebaker-64.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -D pixmaps/gnomebaker-72.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
+install -D pixmaps/gnomebaker-96.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}-48.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,13 +113,22 @@ update-desktop-database &> /dev/null || :
 %doc AUTHORS COPYING TODO
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/icons/hicolor/48x48/apps/%{name}-48.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
+%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
 %{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Tue Oct 16 2012 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-15
+- Add more icon sizes; fixes the wrong icon size in Xfce menu
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild