From b9ecb474a8c8a4e8ad0c399a0d60f59dbdddcb39 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen@fedoraproject.org>
Date: Thu, 3 Apr 2008 02:58:06 +0000
Subject: [PATCH] Fix Qt path

---
 libsvm-2.86.patch | 17 +++++++++--------
 libsvm.spec       |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/libsvm-2.86.patch b/libsvm-2.86.patch
index e5130a2..08dd8e5 100644
--- a/libsvm-2.86.patch
+++ b/libsvm-2.86.patch
@@ -371,8 +371,8 @@ 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	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 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 -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 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 +
 +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:
diff --git a/libsvm.spec b/libsvm.spec
index f51d160..21e753c 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Mar 13 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-6
+* Thu Mar 13 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-7
 - Fix the Qt path problem
 
 * Wed Mar 12 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-4