rpms/libsvm/F-7 libsvm-2.85.patch,1.1,1.2 libsvm.spec,1.8,1.9

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14748/F-7

Modified Files:
	libsvm-2.85.patch libsvm.spec 
Log Message:
Fix svm-toy-gt build error

libsvm-2.85.patch:

Index: libsvm-2.85.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm-2.85.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsvm-2.85.patch	4 Feb 2008 08:16:09 -0000	1.1
+++ libsvm-2.85.patch	5 Feb 2008 01:22:38 -0000	1.2
@@ -131,7 +131,7 @@
 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-04 16:49:05.000000000 +1000
++++ ./python/Makefile	2008-02-05 09:37:16.000000000 +1000
 @@ -2,9 +2,16 @@ CXX? = g++
  SWIG ?= swig
  
@@ -240,8 +240,8 @@
      assert os.path.exists(dataset_pathname),"dataset not found"
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2007-11-06 23:32:49.000000000 +1000
-+++ ./Makefile	2008-02-04 17:22:47.000000000 +1000
-@@ -1,8 +1,46 @@
++++ ./Makefile	2008-02-05 11:00:21.000000000 +1000
+@@ -1,8 +1,41 @@
  CXX? = g++
  CFLAGS = -Wall -O3 
 +MAKE = make
@@ -259,21 +259,16 @@
  
 +export INSTDIR
 +
-+PROCESSOR=$(shell /bin/uname -p)
-+ifeq "${PROCESSOR}" "x86_64"
-+X86_64=64
-+else
-+X86_64=
-+endif
++IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
 +
 +ifndef LIBDIR
-+LIB_INSTDIR=${INSTDIR}/lib${X86_64}
++LIB_INSTDIR=${INSTDIR}/lib${IS_64}
 +else
 +LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
 +endif
 +
 +ifndef LIBDIR
-+LIBDIR=/usr/lib${X86_64}
++LIBDIR=/usr/lib${IS_64}
 +endif
 +
 +export LIBDIR
@@ -289,7 +284,7 @@
  svm-predict: svm-predict.c svm.o
  	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
  svm-train: svm-train.c svm.o
-@@ -12,4 +50,61 @@ svm-scale: svm-scale.c
+@@ -12,4 +45,61 @@ svm-scale: svm-scale.c
  svm.o: svm.cpp svm.h
  	$(CXX) $(CFLAGS) -c svm.cpp
  clean:
@@ -386,7 +381,7 @@
  	rm -f *~ svm-toy svm-toy.moc ../../svm.o
 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-04 17:19:37.000000000 +1000
++++ ./svm-toy/gtk/Makefile	2008-02-05 09:33:08.000000000 +1000
 @@ -1,22 +1,25 @@
  CC? = gcc
  CXX? = g++
@@ -415,11 +410,20 @@
 -	$(CXX) $(CFLAGS) -c callbacks.cpp
 +	$(CXX) $(COPT) -c callbacks.cpp
  
--../../svm.o:
--	cd ../..; make svm.o
-+#../../svm.o:
-+#	cd ../..; make svm.o
+ ../../svm.o:
+ 	cd ../..; make svm.o
  
  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.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
+@@ -2,6 +2,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <list>
++#include <stdlib.h>
+ #include "callbacks.h"
+ #include "interface.h"
+ #include "../../svm.h"


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libsvm.spec	4 Feb 2008 08:16:09 -0000	1.8
+++ libsvm.spec	5 Feb 2008 01:22:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.85
-Release:        0%{?dist}
+Release:        2%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -31,7 +31,7 @@
 %package devel
 Summary:    Header file, object file, and source files of libsvm in C, C++ and Java
 Group:      Development/Libraries
-BuildRequires:  glibc-devel 
+BuildRequires:  glibc-devel gawk
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
@@ -94,7 +94,7 @@
 
 
 %build
-make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}"
+make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR=%{_libdir}
 %{__sed} -i 's/\r//' FAQ.html
 %{__sed} -i 's/\r//' ChangeLog
 mv python/README python/README-Python
@@ -163,6 +163,12 @@
 
 
 %changelog
+* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-2
+- Fix svm-toy-qt build error
+
+* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-1
+- Fix svm-toy-gtk build error
+
 * Mon Feb 04 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-0
 - Upgrade to 2.85
 - Include guide.pdf in main package