rpms/libsvm/devel libsvm-2.86.patch,1.4,1.5 libsvm.spec,1.22,1.23
Ding-Yi Chen (dchen)
fedora-extras-commits at redhat.com
Thu Apr 3 02:36:12 UTC 2008
Author: dchen
Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6115/devel
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/devel/libsvm-2.86.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsvm-2.86.patch 2 Apr 2008 05:31:16 -0000 1.4
+++ libsvm-2.86.patch 3 Apr 2008 02:36:03 -0000 1.5
@@ -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 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 @@
-#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 @@
+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 @@
- 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:
Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libsvm.spec 3 Apr 2008 01:14:27 -0000 1.22
+++ libsvm.spec 3 Apr 2008 02:36:03 -0000 1.23
@@ -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 @@
%changelog
-* Thu Mar 13 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-5
+* Thu Mar 13 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-6
- Fix the Qt path problem
* Wed Mar 12 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-4
More information about the fedora-extras-commits
mailing list