rpms/libsvm/devel libsvm-2.86.patch,1.2,1.3 libsvm.spec,1.18,1.19

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14696/devel

Modified Files:
	libsvm-2.86.patch libsvm.spec 
Log Message:
Support both Qt3 and Qt4

libsvm-2.86.patch:

Index: libsvm-2.86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-2.86.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsvm-2.86.patch	2 Apr 2008 04:23:24 -0000	1.2
+++ libsvm-2.86.patch	2 Apr 2008 04:50:12 -0000	1.3
@@ -371,8 +371,8 @@
 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	2007-10-14 16:29:12.000000000 +1000
-+++ ./svm-toy/qt/Makefile	2008-04-02 14:07:17.000000000 +1000
-@@ -1,19 +1,43 @@
++++ ./svm-toy/qt/Makefile	2008-04-02 14:46:28.000000000 +1000
+@@ -1,19 +1,46 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
 -BIN = $(QTDIR)/bin
@@ -391,11 +391,11 @@
 -	$(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt 
 +ifdef QT4_DIR
 +  QTDIR=${QT4_DIR}
-+  BIN = $(QTDIR)/bin
++  BIN = ${QTDIR}/bin
 +  FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT `pkg-config --cflags --libs Qt3Support QtGui`
 +else
 +  QTDIR=${LIBDIR}/qt-3.3
-+  BIN = $(QTDIR)/bin
++  BIN = ${QTDIR}/bin
 +  FLAGS=${CFLAGS} `pkg-config --cflags --libs qt-mt`
 +endif
 +
@@ -418,10 +418,13 @@
 +	echo "LIBDIR=${LIBDIR}"
 +	echo "QTDIR=${QTDIR}"
 +	echo "FLAGS=${FLAGS}"
-+	$(BIN)/moc svm-toy.new.cpp -o svm-toy.moc
++	${BIN}/moc svm-toy.new.cpp -o svm-toy.moc
 +#../../svm.o:
 +#	cd ../..; make svm.o
 +svm-toy.new.cpp: svm-toy.cpp
++	echo "LIBDIR=${LIBDIR}"
++	echo "QTDIR=${QTDIR}"
++	echo "FLAGS=${FLAGS}"
 +	cp svm-toy.cpp svm-toy.new.cpp
 +ifdef QT4_DIR
 +	${BIN}/qt3to4 -alwaysOverwrite  svm-toy.new.cpp


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libsvm.spec	2 Apr 2008 04:23:24 -0000	1.18
+++ libsvm.spec	2 Apr 2008 04:50:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.86
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -203,7 +203,7 @@
 
 
 %changelog
-* Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-1
+* Wed Mar 12 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-2
 - Support both Qt3 for F8 and earlier, and Qt4 for F9
 
 * Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-0