[weka/f16: 2/2] Merge branch 'f17' into f16

[Miloš Jakubíček]

commit 77b3631c015236cfe3d8c40676f8a368406b9f25
Merge: 350dfef b233225
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sun Aug 19 20:08:45 2012 +0200

    Merge branch 'f17' into f16
    
    Conflicts:
    	weka.spec

 .gitignore |    1 +
 sources    |    2 +-
 weka.spec  |   11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc weka.spec
index 9cd58a6,4a3ede0..85704e0
--- a/weka.spec
+++ b/weka.spec
@@@ -142,9 -143,9 +142,12 @@@ f
  %{_javadocdir}/%{name}
  
  %changelog
+ * Sun Aug 19 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 3.6.8-1
+ - Update to 3.6.8
+ 
 +* 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