Merge branch 'master' into el6

.gitignore

@@ -6,3 +6,8 @@ libsvm-2.91.tar.gz
 /libsvm-3.11.tar.gz
 /libsvm-3.12.tar.gz
 /libsvm-3.17.tar.gz
+/libsvm-3.18.tar.gz
+/log
+/LibSVM-svm-toy-48.png
+/libsvm-svm-toy-gtk.desktop
+/libsvm-svm-toy-qt.desktop

libsvm.spec

@@ -1,6 +1,6 @@
 %define shver 2
 Name:           libsvm
-Version:        3.17
+Version:        3.18
 Release:        1%{?dist}
 Summary:        A Library for Support Vector Machines
 
@@ -81,7 +81,7 @@ Group:      Development/Libraries
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  jpackage-utils
 
-Requires:  java >= 1.5.0
+Requires:  java-headless >= 1.5.0
 Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
@@ -162,7 +162,7 @@ echo -e "# This file is not in the original libsvm tarball, but added for conven
 # This file is released under BSD license, just like the rest of the package.\n"\
  > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
 
-desktop-file-install --delete-original --vendor=fedora \
+desktop-file-install --delete-original \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \
@@ -227,17 +227,32 @@ rm -rf $RPM_BUILD_ROOT
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
 %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png
-%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop
+%{_datadir}/applications/*%{name}-svm-toy-gtk.desktop
 
 %files svm-toy-qt
 %defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
 %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png
-%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop
+%{_datadir}/applications/*%{name}-svm-toy-qt.desktop
 
 
 %changelog
+* Tue Apr 22 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-1
+- Upstream update to 3.18
+- svm.cpp and svm-scale.c: check return values of fscanf
+- matlab interface: Makefile no longer handles octave 
+  because make.m should be used
+
+* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 3.17-4
+- Use Requires: java-headless rebuild (#1067528)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Apr 25 2013 Jon Ciesla <limburgher@gmail.com> - 3.17-2
+- Drop desktop vendor tag.
+
 * Sat Apr 13 2013 Ding-Yi Chen <dchen@redhat.com> - 3.17-1
 - Upstream update from 3.13 to 3.17
   svm.c and svm.h:
@@ -416,7 +431,7 @@ rm -rf $RPM_BUILD_ROOT
     * better gradient reconstructions
     * issue a warning when -h 0 may be faster
 
-* Thu Apr 29 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-13
+* Tue Apr 29 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-13
 - Fix svm-toy-qt clear button does not clear.
   (from Hsiang-Fu Yu in National Taiwan University)
 
@@ -446,7 +461,7 @@ rm -rf $RPM_BUILD_ROOT
 - [Bug 436392]: Fix by copy from right place.
 -  Add desktop files and icons for svm-toy-gtk and svm-toy-qt
 
-* Tue Feb 11 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-4
+* Mon Feb 11 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-4
 - Move gnuplot from BuildRequires to Requires
 
 * Thu Feb 07 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-3
@@ -466,7 +481,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add svm-toy-gtk
 - Add svm-toy-qt
 
-* Wed Dec 20 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-9
+* Thu Dec 20 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-9
 - [Bug 254091] Comment 19
 - Fix python/Makefile
 
@@ -478,11 +493,11 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Dec 03 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-7
 - [Bug 254091] Review Request: libsvm - A Library for Support Vector Machines (Comment #12)
 
-* Thu Sep 26 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-6
+* Wed Sep 26 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-6
 - Add defattr to each subpackage
 - Move libsvm.so to libsvm
 
-* Thu Sep 24 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-5
+* Mon Sep 24 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so
 

sources

@@ -1,2 +1,6 @@
 b1543809993e2653dd2787f62c3c390a  guide.pdf
-67f8b597ce85c1f5288d7838e57ea28a  libsvm-3.17.tar.gz
+bba35e2cf9d14e158009ef8b90fd840a  libsvm-3.18.tar.gz
+95918671ee5435803a1646e1ad2f3317  log
+0bc4868057a7c1c422f91a798f14a562  LibSVM-svm-toy-48.png
+398721fc66bb0903d46c685e9a3cba27  libsvm-svm-toy-gtk.desktop
+9a518db15afe9224e3a04695c82d7142  libsvm-svm-toy-qt.desktop