Merge branch 'f17' into f16

Conflicts:
	weka.spec

weka.spec

@@ -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
@@ -146,6 +145,9 @@ fi
 * Sun Aug 19 2012 Miloš Jakubíček <xjakub@fi.muni.cz> - 3.6.8-1
 - Update to 3.6.8
 
+* Sun Aug 19 2012 Miloš Jakubíček <xjakub@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@lists.fedoraproject.org> - 3.6.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild