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

---
 libsvm-2.86.patch | 23 ++++++++++++-----------
 libsvm.spec       |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/libsvm-2.86.patch b/libsvm-2.86.patch
index 9a3e6b0..e5130a2 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-02 15:27:24.000000000 +1000
-@@ -1,19 +1,46 @@
++++ ./svm-toy/qt/Makefile	2008-04-03 12:27:41.000000000 +1000
+@@ -1,19 +1,47 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
 -BIN = $(QTDIR)/bin
@@ -381,7 +381,6 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 -#BIN = /usr/bin
 -#INCLUDE = /usr/include/qt3
 -#LIB = /usr/lib/qt3
-+#CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
 +CFLAGS = -Wall -O3 
 +QT4_DIR= $(shell if [ -e /usr/lib/qt4 ]; then echo /usr/lib/qt4; fi)
 +#LIBDIR=/usr/lib64
@@ -392,7 +391,11 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 +ifdef QT4_DIR
 +  QTDIR=/usr/lib/qt4
 +  BIN = ${QTDIR}/bin
-+  FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT `pkg-config --cflags --libs Qt3Support QtGui`
++  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
++  endif
 +else
 +  QTDIR=${LIBDIR}/qt-3.3
 +  BIN = ${QTDIR}/bin
@@ -415,19 +418,17 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
 -	cd ../..; make svm.o
 +
 +svm-toy.moc: svm-toy.new.cpp
-+	echo "LIBDIR=${LIBDIR}"
-+	echo "QTDIR=${QTDIR}"
-+	echo "FLAGS=${FLAGS}"
++#	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 "LIBDIR=${LIBDIR}"
-+	echo "QTDIR=${QTDIR}"
-+	echo "FLAGS=${FLAGS}"
 +	cp svm-toy.cpp svm-toy.new.cpp
 +ifdef QT4_DIR
-+	/usr/lib/qt4/bin/qt3to4 -alwaysOverwrite  svm-toy.new.cpp
++	${QT3_TO4$} -alwaysOverwrite  svm-toy.new.cpp
 +endif
 +
  clean:
diff --git a/libsvm.spec b/libsvm.spec
index 2b1a67e..f51d160 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.86
-Release:        5%{?dist}
+Release:        6%{?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-5
+* Thu Mar 13 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-6
 - Fix the Qt path problem
 
 * Wed Mar 12 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-4