[weka/f16] - Include directly weka.png to workaround an ImageMagick issue on F16

[Miloš Jakubíček]

commit 350dfef2d5a9076264465743ae5b793c83ab1096
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sun Aug 19 16:43:18 2012 +0200

    - Include directly weka.png to workaround an ImageMagick issue on F16

 weka.png  |  Bin 0 -> 2213 bytes
 weka.spec |   12 +++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/weka.png b/weka.png
new file mode 100644
index 0000000..cb92708
Binary files /dev/null and b/weka.png differ
diff --git a/weka.spec b/weka.spec
index dac8340..9cd58a6 100644
--- a/weka.spec
+++ b/weka.spec
@@ -7,7 +7,7 @@
 
 Name:			weka
 Version:		3.6.7
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Waikato Environment for Knowledge Analysis
 
 Group:			Applications/Engineering
@@ -15,6 +15,8 @@ License:		GPLv2+
 URL:			http://www.cs.waikato.ac.nz/ml/%{name}/
 Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip
 Source1:		weka.desktop
+# Obtained by convert weka.ico weka.png on F17 to workaround an ImageMagick issue
+Source2:		weka.png
 Patch0:			weka-3.6.2-build.xml.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
@@ -23,7 +25,6 @@ BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	ant
 BuildRequires:	desktop-file-utils
-BuildRequires:	ImageMagick
 BuildRequires:	junit
 BuildRequires:	jflex
 BuildRequires:	java_cup >= 1:0.11a
@@ -105,9 +106,7 @@ chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}
 # desktop file and icon
 desktop-file-install \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
-# convert icon to png
-convert %{name}.ico %{name}.png
-install -Dp %{name}-0.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -Dp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,6 +142,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Aug 19 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 3.6.7-3
+- Include directly weka.png to workaround an ImageMagick issue on F16
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild