rpms/libsvm/devel libsvm-2.86.patch,1.5,1.6 libsvm.spec,1.23,1.24

[Ding-Yi Chen (dchen)]

Author: dchen

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

Modified Files:
	libsvm-2.86.patch libsvm.spec 
Log Message:
Fix Qt path

libsvm-2.86.patch:

Index: libsvm-2.86.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-2.86.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsvm-2.86.patch	3 Apr 2008 02:36:03 -0000	1.5
+++ libsvm-2.86.patch	3 Apr 2008 02:58:06 -0000	1.6
@@ -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-03 12:27:41.000000000 +1000
-@@ -1,19 +1,47 @@
++++ ./svm-toy/qt/Makefile	2008-04-03 12:55:56.000000000 +1000
+@@ -1,19 +1,48 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
 -BIN = $(QTDIR)/bin
@@ -389,12 +389,12 @@
 -svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
 -	$(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt 
 +ifdef QT4_DIR
-+  QTDIR=/usr/lib/qt4
++  QTDIR=${QT4_DIR}
 +  BIN = ${QTDIR}/bin
 +  FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT -DQT_INCLUDE_COMPAT `pkg-config --cflags --libs Qt3Support QtGui`
-+  QT3_TO_4=$(shell if [ -e ${BIN}/qt3to4 ]; then echo ${BIN}/qt3to4; fi)
-+  ifndef QT3_TO4
-+    QT3_TO_4=/usr/bin/qt3to4
++  QT3_TO_4=$(shell if [ -e "${BIN}/qt3to4" ]; then echo "${BIN}/qt3to4"; fi)
++  ifndef QT3_TO_4
++    QT3_TO_4=$(shell if [ -e /usr/bin/qt3to4 ]; then echo /usr/bin/qt3to4; fi)
 +  endif
 +else
 +  QTDIR=${LIBDIR}/qt-3.3
@@ -419,16 +419,17 @@
 +
 +svm-toy.moc: svm-toy.new.cpp
 +#	echo "LIBDIR=${LIBDIR}"
-+#	echo "QTDIR=${QTDIR}"
 +#	echo "FLAGS=${FLAGS}"
 +	${BIN}/moc svm-toy.new.cpp -o svm-toy.moc
 +#../../svm.o:
 +#	cd ../..; make svm.o
 +
 +svm-toy.new.cpp: svm-toy.cpp
++#	echo "QTDIR=${QTDIR}"
 +	cp svm-toy.cpp svm-toy.new.cpp
 +ifdef QT4_DIR
-+	${QT3_TO4$} -alwaysOverwrite  svm-toy.new.cpp
++	echo "QT3_TO_4=${QT3_TO_4}"
++	${QT3_TO_4} -alwaysOverwrite  svm-toy.new.cpp
 +endif
 +
  clean:


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libsvm.spec	3 Apr 2008 02:36:03 -0000	1.23
+++ libsvm.spec	3 Apr 2008 02:58:06 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.86
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -203,7 +203,7 @@
 
 
 %changelog
-* Thu Mar 13 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-6
+* Thu Mar 13 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-7
 - Fix the Qt path problem
 
 * Wed Mar 12 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-4