rpms/qtiplot/devel qtiplot-buildconf.patch,NONE,1.1

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25388

Added Files:
	qtiplot-buildconf.patch 
Log Message:
fix build.conf to use system-wide libs and enable CustomInstall


qtiplot-buildconf.patch:
 build.conf.example |   47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

--- NEW FILE qtiplot-buildconf.patch ---
--- qtiplot-0.9.7.12.org/build.conf.example	2010-01-21 15:15:34.000000000 +0800
+++ qtiplot-0.9.7.12/build.conf.example	2010-02-09 22:50:04.885700545 +0800
@@ -16,37 +16,37 @@
 ##########################################################
 
 # include path. leave it blank to use SYS_INCLUDE
-MUPARSER_INCLUDEPATH = $$QTI_ROOT/3rdparty/muparser/include
+MUPARSER_INCLUDEPATH = /usr/include/muParser
 # link statically against a copy in 3rdparty/
-MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
+#MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
 # or dynamically against a system-wide installation
-#MUPARSER_LIBS = -lmuparser
+MUPARSER_LIBS = -lmuparser
 
 ##########################################################
 ## GNU Sientific Library (http://www.gnu.org/software/gsl/)
 ##########################################################
 
 # include path. leave it blank to use SYS_INCLUDE
-GSL_INCLUDEPATH = $$QTI_ROOT/3rdparty/gsl/include
+GSL_INCLUDEPATH = /usr/include/gsl
 # link statically against a copy in 3rdparty/
-GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
-           $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a
+#GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
+#           $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a
 # or dynamically against a system-wide installation
-#GSL_LIBS = -lgsl -lgslcblas
+GSL_LIBS = -lgsl -lgslcblas
 
 ##########################################################
 ## Boost libraries (http://www.boost.org/)
 ##########################################################
 
 # include path. leave it blank to use SYS_INCLUDE
-BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
+BOOST_INCLUDEPATH = /usr/include/boost
 # link statically against a copy in 3rdparty/
-unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
+#				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
+#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
+#				   $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
 # or dynamically against a system-wide installation
-#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
 
 ##########################################################
 ## QWT - use local copy till upstream catches up
@@ -75,9 +75,9 @@
 ###########################################################
 
 # include path.
-XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/
+#XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/
 # link locally against a copy in 3rdparty/
-XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
+#XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
 
 ###########################################################
 ## QuaZIP - optional. you don't have to set these variables
@@ -85,20 +85,21 @@
 ###########################################################
 
 # include path.
-QUAZIP_INCLUDEPATH = $$QTI_ROOT/3rdparty/quazip/quazip/
+QUAZIP_INCLUDEPATH = /usr/include/quazip
+INCLUDEPATH += /usr/include/minizip
 # link locally against a copy in 3rdparty/
-QUAZIP_LIBS = $$QTI_ROOT/3rdparty/quazip/lib/libquazip.a
+QUAZIP_LIBS = -lquazip
 
 ##########################################################
 ## libpng - optional. you don't have to set these variables
 ##########################################################
 
 # include path. leave it blank to use SYS_INCLUDE
-LIBPNG_INCLUDEPATH = $$QTI_ROOT/3rdparty/libpng/
+LIBPNG_INCLUDEPATH = /usr/include/libpng12
 # link statically against a copy in 3rdparty/
-LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
+#LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
 # or dynamically against a system-wide installation
-#LIBPNG_LIBS = -lpng
+LIBPNG_LIBS = -lpng
 
 ##########################################################
 ## EmfEngine - optional. you don't have to set these variables
@@ -106,9 +107,9 @@
 ##########################################################
 
 # include path.
-EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
+#EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
 # link locally against a copy in 3rdparty/
-EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
+#EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
 
 ##########################################################
 ## python - only used if python is needed
@@ -144,7 +145,7 @@
   #DEFINES         += QTIPLOT_SUPPORT
 
   # Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro.
-  #CONFIG          += CustomInstall
+  CONFIG          += CustomInstall
 
   # Uncomment the following line if you want to build QtiPlot as a browser plugin (not working on Internet Explorer).
   #CONFIG          += BrowserPlugin