From cb285d07f3e3751f93434505b43981b95bef45ad Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 3 Apr 2008 03:34:44 +0000 Subject: [PATCH] Fix Qt path --- libsvm-2.86.patch | 6 +++--- libsvm.spec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libsvm-2.86.patch b/libsvm-2.86.patch index 08dd8e5..f6f5eb7 100644 --- a/libsvm-2.86.patch +++ b/libsvm-2.86.patch @@ -371,7 +371,7 @@ 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:55:56.000000000 +1000 ++++ ./svm-toy/qt/Makefile 2008-04-03 13:32:39.000000000 +1000 @@ -1,19 +1,48 @@ CXX? = g++ -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT @@ -382,9 +382,9 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile -#INCLUDE = /usr/include/qt3 -#LIB = /usr/lib/qt3 +CFLAGS = -Wall -O3 -+QT4_DIR= $(shell if [ -e /usr/lib/qt4 ]; then echo /usr/lib/qt4; fi) -+#LIBDIR=/usr/lib64 ++#LIBDIR?=/usr/lib64 +#QT4_DIR= ++QT4_DIR= $(shell if [ -e ${LIBDIR}/qt4 ]; then echo ${LIBDIR}/qt4; fi) -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 diff --git a/libsvm.spec b/libsvm.spec index 21e753c..ae45d72 100644 --- a/libsvm.spec +++ b/libsvm.spec @@ -1,6 +1,6 @@ Name: libsvm Version: 2.86 -Release: 7%{?dist} +Release: 8%{?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 - 2.86-7 +* Thu Mar 13 2008 Ding-Yi Chen - 2.86-8 - Fix the Qt path problem * Wed Mar 12 2008 Ding-Yi Chen - 2.86-4