rpms/qtiplot/devel qtiplot-path.patch,1.1,1.2 qtiplot.spec,1.6,1.7
Frank Büttner
frankb at fedoraproject.org
Sat Jan 10 14:29:50 UTC 2009
Author: frankb
Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32394
Modified Files:
qtiplot-path.patch qtiplot.spec
Log Message:
fix the path patch
qtiplot-path.patch:
Index: qtiplot-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtiplot-path.patch 21 Oct 2007 18:16:02 -0000 1.1
+++ qtiplot-path.patch 10 Jan 2009 14:29:50 -0000 1.2
@@ -1,59 +1,52 @@
-diff -Naur qtiplot-0.9.org/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.org/fitPlugins/fitRational0/fitRational0.pro 2007-06-13 01:16:08.000000000 +0200
-+++ qtiplot-0.9/fitPlugins/fitRational0/fitRational0.pro 2007-10-06 13:39:06.000000000 +0200
-@@ -12,13 +12,13 @@
- DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl
--LIBS += ../3rdparty/gsl/lib/libgsl.a
--LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#INCLUDEPATH += ../../3rdparty/gsl
-+#LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
-
--target.path=/usr/lib$${libsuff}/qtiplot/plugins
-+target.path= TARGETPATH
- INSTALLS += target
-
- SOURCES += fitRational0.cpp
-diff -Naur qtiplot-0.9.org/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.org/fitPlugins/fitRational1/fitRational1.pro 2007-06-13 01:16:08.000000000 +0200
-+++ qtiplot-0.9/fitPlugins/fitRational1/fitRational1.pro 2007-10-06 13:39:22.000000000 +0200
-@@ -13,12 +13,12 @@
-
- # statically link against GSL in 3rdparty
- INCLUDEPATH += ../../3rdparty/gsl
--LIBS += ../3rdparty/gsl/lib/libgsl.a
--LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
-
--target.path=/usr/lib$${libsuff}/qtiplot/plugins
-+target.path= TARGETPATH
- INSTALLS += target
-
- SOURCES += fitRational1.cpp
-diff -Naur qtiplot-0.9.org/qtiplot/qtiplot.pro qtiplot-0.9/qtiplot/qtiplot.pro
---- qtiplot-0.9.org/qtiplot/qtiplot.pro 2007-09-20 13:55:53.000000000 +0200
-+++ qtiplot-0.9/qtiplot/qtiplot.pro 2007-10-06 16:28:59.000000000 +0200
-@@ -21,8 +21,8 @@
- unix: INSTALLBASE = /usr
- win32: INSTALLBASE = c:/QtiPlot
-
--unix: target.path = $$INSTALLBASE/bin
--unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
-+unix: target.path = BINDIR
-+unix: documentation.path = DOCDIR
- win32: target.path = $$INSTALLBASE
- win32: documentation.path = $$INSTALLBASE/doc
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro 2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro 2009-01-10 15:16:51.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += --lgsl -lgslcblas
+
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
+ SOURCES += fitRational0.cpp
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/fitRational1/fitRational1.pro 2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro 2009-01-10 15:17:49.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
+
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
+
+ SOURCES += fitRational1.cpp
+diff -Naur qtiplot-0.9.7.4.org/qtiplot/qtiplot.pro qtiplot-0.9.7.4/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.4.org/qtiplot/qtiplot.pro 2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/qtiplot/qtiplot.pro 2009-01-10 15:24:13.000000000 +0100
@@ -30,12 +30,12 @@
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
@@ -61,60 +54,54 @@
-INCLUDEPATH += ../3rdparty/muparser/include
-INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
--INCLUDEPATH += ../3rdparty/liborigin
++INCLUDEPATH += MUPARSERINC
++INCLUDEPATH += QWTPLOT3DINC
++INCLUDEPATH += QWTINC
+ INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
-INCLUDEPATH += ../3rdparty/zlib123/include
-+INCLUDEPATH += MUPARSERINC
-+INCLUDEPATH += QWTPLOT3DINC
-+INCLUDEPATH += QWTINC
-+INCLUDEPATH += ../3rdparty/liborigin
-+INCLUDEPATH += GSLINC
-+INCLUDEPATH += ZLIBINC
++INCLUDEPATH += GSLINC
++INCLUDEPATH += ZLIBINC
+ INCLUDEPATH += ../3rdparty/boost_1_36_0
##################### 3rd PARTY LIBRARIES SECTION ###########################
- #!!! Warning: You must modify these paths according to your computer settings
-@@ -44,17 +44,17 @@
+@@ -45,17 +45,17 @@
##################### Linux (Mac OS X) ######################################
# statically link against libraries in 3rdparty
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+-unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a
+-unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
++#unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a
++#unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a
# dynamically link against dependencies if they are installed system-wide
-#unix:LIBS += -lmuparser
--#unix:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
-#unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lmuparser
-+unix:LIBS += -lqwtplot3d-qt4
+unix:LIBS += -lqwt
+unix:LIBS += -lgsl -lgslcblas
##################### Windows ###############################################
-@@ -355,6 +355,7 @@
-
- HEADERS += ../3rdparty/liborigin/OPJFile.h
- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-+#unix:LIBS += -lorigin
-
- ###############################################################
- ##################### SCRIPTING LANGUAGES SECTION #############
-@@ -365,7 +366,8 @@
- contains(SCRIPTING_LANGS, muParser) {
- DEFINES += SCRIPTING_MUPARSER
-
-- HEADERS += src/muParserScript.h \
-+unix:LIBS += -lmuparser
-+HEADERS += src/muParserScript.h \
- src/muParserScripting.h \
+@@ -89,10 +89,10 @@
+ unix: INSTALLBASE = /usr
+ win32: INSTALLBASE = C:/QtiPlot
+
+- unix: target.path = $$INSTALLBASE/bin
++ unix: target.path = BINDIR
+ unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
+ unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+- unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
++ unix: documentation.path = DOCDIR
+ unix: man.path = $$INSTALLBASE/share/man/man1/
- SOURCES += src/muParserScript.cpp \
+ win32: target.path = $$INSTALLBASE
Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qtiplot.spec 10 Jan 2009 14:07:52 -0000 1.6
+++ qtiplot.spec 10 Jan 2009 14:29:50 -0000 1.7
@@ -34,7 +34,7 @@
Source1: http://soft.proindependent.com/misc/colormaps.tgz
Source2: %{name}.desktop
Patch0: qtiplot-path.patch
-Patch1: qtiplot-includes.patch
+#Patch1: qtiplot-includes.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -133,6 +133,9 @@
%changelog
+* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-3
+ - fix the patch files
+
* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-2
- dummy for koji
More information about the scm-commits
mailing list