diff --git a/libsvm-2.86.patch b/libsvm-2.86.patch index 215e18c..a33b271 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 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 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile - $(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 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile + 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 diff --git a/libsvm.spec b/libsvm.spec index 3f66662..24c6ddf 100644 --- a/libsvm.spec +++ b/libsvm.spec @@ -1,6 +1,6 @@ Name: libsvm Version: 2.86 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -203,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 12 2008 Ding-Yi Chen - 2.86-2 +* Wed Mar 12 2008 Ding-Yi Chen - 2.86-3 - Support both Qt3 for F8 and earlier, and Qt4 for F9 * Tue Mar 11 2008 Ding-Yi Chen - 2.86-0