From 04c3d61d049562f9e2164574357b673ade448928 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 1 Apr 2008 07:34:44 +0000 Subject: [PATCH] Upstream update to 2.86 --- .cvsignore | 2 +- libsvm-2.85.patch => libsvm-2.86.patch | 77 +++++++++++++++----------- libsvm.spec | 20 +++++-- log | 9 ++- sources | 2 +- 5 files changed, 69 insertions(+), 41 deletions(-) rename libsvm-2.85.patch => libsvm-2.86.patch (83%) diff --git a/.cvsignore b/.cvsignore index 9708a72..d5d706e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ guide.pdf -libsvm-2.85.tar.gz +libsvm-2.86.tar.gz diff --git a/libsvm-2.85.patch b/libsvm-2.86.patch similarity index 83% rename from libsvm-2.85.patch rename to libsvm-2.86.patch index dc68a3d..45b5277 100644 --- a/libsvm-2.85.patch +++ b/libsvm-2.86.patch @@ -1,6 +1,6 @@ diff -up ./java/test_applet.html.orig ./java/test_applet.html ---- ./java/test_applet.html.orig 2008-02-04 10:11:00.000000000 +1000 -+++ ./java/test_applet.html 2008-02-04 10:13:02.000000000 +1000 +--- ./java/test_applet.html.orig 2003-07-12 14:06:55.000000000 +1000 ++++ ./java/test_applet.html 2008-04-01 16:17:52.000000000 +1000 @@ -1 +1,3 @@ - + @@ -8,8 +8,8 @@ diff -up ./java/test_applet.html.orig ./java/test_applet.html + diff -up ./java/svm_train.java.orig ./java/svm_train.java diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java ---- ./java/libsvm/svm_parameter.java.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/libsvm/svm_parameter.java 2008-02-04 10:13:02.000000000 +1000 +--- ./java/libsvm/svm_parameter.java.orig 2006-03-04 01:44:14.000000000 +1000 ++++ ./java/libsvm/svm_parameter.java 2008-04-01 16:17:52.000000000 +1000 @@ -1,6 +1,7 @@ package libsvm; public class svm_parameter implements Cloneable,java.io.Serializable @@ -19,8 +19,8 @@ diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java public static final int C_SVC = 0; public static final int NU_SVC = 1; diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java ---- ./java/libsvm/svm_problem.java.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/libsvm/svm_problem.java 2008-02-04 10:13:02.000000000 +1000 +--- ./java/libsvm/svm_problem.java.orig 2003-10-11 22:30:47.000000000 +1000 ++++ ./java/libsvm/svm_problem.java 2008-04-01 16:17:52.000000000 +1000 @@ -1,6 +1,7 @@ package libsvm; public class svm_problem implements java.io.Serializable @@ -30,8 +30,8 @@ diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java public double[] y; public svm_node[][] x; diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java ---- ./java/libsvm/svm_node.java.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/libsvm/svm_node.java 2008-02-04 10:13:02.000000000 +1000 +--- ./java/libsvm/svm_node.java.orig 2003-10-11 22:30:47.000000000 +1000 ++++ ./java/libsvm/svm_node.java 2008-04-01 16:17:52.000000000 +1000 @@ -1,6 +1,7 @@ package libsvm; public class svm_node implements java.io.Serializable @@ -40,9 +40,10 @@ diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java public int index; public double value; } +diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4 diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java ---- ./java/libsvm/svm_model.java.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/libsvm/svm_model.java 2008-02-04 10:13:02.000000000 +1000 +--- ./java/libsvm/svm_model.java.orig 2007-01-13 08:23:39.000000000 +1000 ++++ ./java/libsvm/svm_model.java 2008-04-01 16:17:52.000000000 +1000 @@ -4,6 +4,7 @@ package libsvm; public class svm_model implements java.io.Serializable @@ -53,11 +54,11 @@ diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java int l; // total #SV diff -up ./java/libsvm/svm.java.orig ./java/libsvm/svm.java diff -up ./java/Makefile.orig ./java/Makefile ---- ./java/Makefile.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/Makefile 2008-02-04 14:26:38.000000000 +1000 +--- ./java/Makefile.orig 2007-11-11 22:17:30.000000000 +1000 ++++ ./java/Makefile 2008-04-01 16:17:52.000000000 +1000 @@ -3,13 +3,22 @@ FILES = libsvm/svm.class libsvm/svm_mode libsvm/svm_parameter.class libsvm/svm_problem.class \ - svm_train.class svm_predict.class svm_toy.class + svm_train.class svm_predict.class svm_toy.class svm_scale.class -#JAVAC = jikes -JAVAC_FLAGS = -target 1.5 -source 1.5 @@ -107,8 +108,8 @@ diff -up ./java/Makefile.orig ./java/Makefile dist: clean all rm *.class libsvm/*.class diff -up ./java/svm_toy.java.orig ./java/svm_toy.java ---- ./java/svm_toy.java.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./java/svm_toy.java 2008-02-04 10:13:02.000000000 +1000 +--- ./java/svm_toy.java.orig 2007-07-01 23:02:51.000000000 +1000 ++++ ./java/svm_toy.java 2008-04-01 16:17:52.000000000 +1000 @@ -6,7 +6,7 @@ import java.awt.event.*; import java.io.*; @@ -127,11 +128,14 @@ diff -up ./java/svm_toy.java.orig ./java/svm_toy.java { super(title); diff -up ./java/svm_predict.java.orig ./java/svm_predict.java +diff -up ./java/svm_scale.java.orig ./java/svm_scale.java +diff -up ./svm.h.orig ./svm.h diff -up ./python/cross_validation.py.orig ./python/cross_validation.py +diff -up ./python/svmc_wrap.c.orig ./python/svmc_wrap.c diff -up ./python/svm_test.py.orig ./python/svm_test.py diff -up ./python/Makefile.orig ./python/Makefile ---- ./python/Makefile.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./python/Makefile 2008-02-05 09:37:16.000000000 +1000 +--- ./python/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 ++++ ./python/Makefile 2008-04-01 16:17:52.000000000 +1000 @@ -2,9 +2,16 @@ CXX? = g++ SWIG ?= swig @@ -193,8 +197,8 @@ diff -up ./python/svm.py.orig ./python/svm.py diff -up ./tools/subset.py.orig ./tools/subset.py diff -up ./tools/checkdata.py.orig ./tools/checkdata.py diff -up ./tools/easy.py.orig ./tools/easy.py ---- ./tools/easy.py.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./tools/easy.py 2008-02-04 10:23:49.000000000 +1000 +--- ./tools/easy.py.orig 2008-02-10 22:12:43.000000000 +1000 ++++ ./tools/easy.py 2008-04-01 16:17:52.000000000 +1000 @@ -2,6 +2,7 @@ import sys @@ -219,8 +223,8 @@ diff -up ./tools/easy.py.orig ./tools/easy.py else: # example for windows diff -up ./tools/grid.py.orig ./tools/grid.py ---- ./tools/grid.py.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./tools/grid.py 2008-02-04 10:13:02.000000000 +1000 +--- ./tools/grid.py.orig 2008-03-10 00:33:09.000000000 +1000 ++++ ./tools/grid.py 2008-04-01 16:17:52.000000000 +1000 @@ -11,7 +11,7 @@ from subprocess import * is_win32 = (sys.platform == 'win32') @@ -238,15 +242,14 @@ diff -up ./tools/grid.py.orig ./tools/grid.py assert os.path.exists(svmtrain_exe),"svm-train executable not found" assert os.path.exists(gnuplot_exe),"gnuplot executable not found" assert os.path.exists(dataset_pathname),"dataset not found" +diff -up ./svm-train.c.orig ./svm-train.c diff -up ./Makefile.orig ./Makefile ---- ./Makefile.orig 2007-11-06 23:32:49.000000000 +1000 -+++ ./Makefile 2008-02-06 15:12:25.000000000 +1000 -@@ -1,15 +1,111 @@ +--- ./Makefile.orig 2007-10-14 16:29:12.000000000 +1000 ++++ ./Makefile 2008-04-01 16:21:40.000000000 +1000 +@@ -1,15 +1,109 @@ CXX? = g++ CFLAGS = -Wall -O3 +MAKE = make -+LIBSVM_VER_MAJOR=2 -+LIBSVM_VER_MINOR=85 +LIBSVM_VER=${LIBSVM_VER_MAJOR}.${LIBSVM_VER_MINOR} +DOT_LIBS=.libs +LIBS= -L${DOT_LIBS} -lsvm @@ -363,9 +366,12 @@ diff -up ./Makefile.orig ./Makefile + rm -f ${INSTDIR}/bin/svm-toy-gtk + rm -f ${INSTDIR}/bin/svm-toy-qt + +diff -up ./svm-scale.c.orig ./svm-scale.c +diff -up ./FAQ.html.orig ./FAQ.html +diff -up ./svm-predict.c.orig ./svm-predict.c diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile ---- ./svm-toy/qt/Makefile.orig 2008-02-04 15:59:51.000000000 +1000 -+++ ./svm-toy/qt/Makefile 2008-02-06 15:08:55.000000000 +1000 +--- ./svm-toy/qt/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 ++++ ./svm-toy/qt/Makefile 2008-04-01 16:17:52.000000000 +1000 @@ -1,19 +1,23 @@ CXX? = g++ CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT @@ -397,9 +403,12 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile +# cd ../..; make svm.o clean: rm -f *~ svm-toy svm-toy.moc ../../svm.o +diff -up ./svm-toy/qt/svm-toy.cpp.orig ./svm-toy/qt/svm-toy.cpp +diff -up ./svm-toy/gtk/interface.h.orig ./svm-toy/gtk/interface.h +diff -up ./svm-toy/gtk/interface.c.orig ./svm-toy/gtk/interface.c diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile ---- ./svm-toy/gtk/Makefile.orig 2008-02-04 15:44:19.000000000 +1000 -+++ ./svm-toy/gtk/Makefile 2008-02-06 15:08:10.000000000 +1000 +--- ./svm-toy/gtk/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 ++++ ./svm-toy/gtk/Makefile 2008-04-01 16:17:52.000000000 +1000 @@ -1,22 +1,28 @@ CC? = gcc CXX? = g++ @@ -439,14 +448,16 @@ diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile clean: - rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o + rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o +diff -up ./svm-toy/gtk/callbacks.h.orig ./svm-toy/gtk/callbacks.h +diff -up ./svm-toy/gtk/main.c.orig ./svm-toy/gtk/main.c diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp ---- ./svm-toy/gtk/callbacks.cpp.orig 2008-02-05 09:43:28.000000000 +1000 -+++ ./svm-toy/gtk/callbacks.cpp 2008-02-05 09:43:42.000000000 +1000 +--- ./svm-toy/gtk/callbacks.cpp.orig 2008-04-01 16:55:09.000000000 +1000 ++++ ./svm-toy/gtk/callbacks.cpp 2008-04-01 17:04:12.000000000 +1000 @@ -2,6 +2,7 @@ #include #include #include -+#include ++#include #include "callbacks.h" #include "interface.h" #include "../../svm.h" diff --git a/libsvm.spec b/libsvm.spec index 5a8ea06..460ac20 100644 --- a/libsvm.spec +++ b/libsvm.spec @@ -1,6 +1,6 @@ Name: libsvm -Version: 2.85 -Release: 6%{?dist} +Version: 2.86 +Release: 0%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -17,6 +17,7 @@ Patch0: %{name}-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %define libsvm_ver_major 2 +%define libsvm_ver_minor 86 %{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define libsvm_python_dir %{python_sitearch}/libsvm @@ -105,7 +106,7 @@ cp %{SOURCE5} %{name}-svm-toy-qt-48.png %build -make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR=%{_libdir} +make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" LIBSVM_VER_MAJOR="%{libsvm_ver_major}" LIBSVM_VER_MINOR=%{libsvm_ver_minor} %{__sed} -i 's/\r//' FAQ.html %{__sed} -i 's/\r//' ChangeLog mv python/README python/README-Python @@ -117,7 +118,7 @@ cp README svm-toy/qt %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER_MAJOR="%{libsvm_ver_major}" LIBSVM_VER_MINOR=%{libsvm_ver_minor} #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ @@ -201,8 +202,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Ding-Yi Chen - 2.86-0 +- Upstream update to 2.86 + - svm-scale for java + - version number in svm.h and svm.m4 + - rename svmtrain.exe to svm-train.exe + - python: while 1 --> while True, Popen -> call + - show best parameters on the contour of grid.py +- LIBSVM_VER_MAJOR and LIBSVM_VER_MINOR are defined in libsvm.spec instead in + * Tue Mar 11 2008 Ding-Yi Chen - 2.85-6 -- Add desktop files in install section. +- Fix build error. * Mon Mar 10 2008 Ding-Yi Chen - 2.85-5 - [Bug 436392]: Fix by copy from right place. diff --git a/log b/log index 75df634..4df78fb 100644 --- a/log +++ b/log @@ -132,4 +132,11 @@ file updated. avoid warning of gcc 4.2 sigma 0.001 to 1e-12; in Newton direction of prob output 2 * (long int) l avoid warning of old Visual C++ - grid.py: avoid gnuplot problem \ No newline at end of file + grid.py: avoid gnuplot problem on windows + +2.86: 2008/04/01 + svm-scale for java + version number in svm.h and svm.m4 + rename svmtrain.exe to svm-train.exe + python: while 1 --> while True, Popen -> call + show best parameters on the contour of grid.py \ No newline at end of file diff --git a/sources b/sources index 03692b7..0372550 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ aae7a8f7e357e86e1c893b706bb02a63 guide.pdf -c839d919cc6fa7b5ad86ea37b7cebcc3 libsvm-2.85.tar.gz +fe0cccace12516382be5a7c513e4b056 libsvm-2.86.tar.gz