rpms/libsvm/F-7 libsvm-2.86.patch,1.2,1.3 libsvm.spec,1.14,1.15

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14833/F-7

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/F-7/libsvm-2.86.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libsvm-2.86.patch	2 Apr 2008 04:30:48 -0000	1.2
+++ libsvm-2.86.patch	3 Apr 2008 03:51:57 -0000	1.3
@@ -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-02 14:07:17.000000000 +1000
-@@ -1,19 +1,43 @@
++++ ./svm-toy/qt/Makefile	2008-04-03 13:32:39.000000000 +1000
+@@ -1,19 +1,48 @@
  CXX? = g++
 -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
 -BIN = $(QTDIR)/bin
@@ -381,21 +381,24 @@
 -#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
++#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 
 +ifdef QT4_DIR
 +  QTDIR=${QT4_DIR}
-+  BIN = $(QTDIR)/bin
-+  FLAGS=${CFLAGS} -I/usr/include/Qt -DQT3_SUPPORT `pkg-config --cflags --libs Qt3Support QtGui`
++  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_TO_4
++    QT3_TO_4=$(shell if [ -e /usr/bin/qt3to4 ]; then echo /usr/bin/qt3to4; fi)
++  endif
 +else
 +  QTDIR=${LIBDIR}/qt-3.3
-+  BIN = $(QTDIR)/bin
++  BIN = ${QTDIR}/bin
 +  FLAGS=${CFLAGS} `pkg-config --cflags --libs qt-mt`
 +endif
 +
@@ -415,16 +418,18 @@
 -	cd ../..; make svm.o
 +
 +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
++#	echo "LIBDIR=${LIBDIR}"
++#	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
-+	${BIN}/qt3to4 -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/F-7/libsvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsvm.spec	2 Apr 2008 04:30:48 -0000	1.14
+++ libsvm.spec	3 Apr 2008 03:51:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.86
-Release:        1%{?dist}
+Release:        8%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -203,7 +203,10 @@
 
 
 %changelog
-* Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-1
+* Thu Mar 13 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-8
+- Fix the Qt path problem
+
+* Wed Mar 12 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-4
 - Support both Qt3 for F8 and earlier, and Qt4 for F9
 
 * Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-0