rpms/scidavis/devel scidavis-0.1.4-pro.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4
Eric Tanguy
tanguy at fedoraproject.org
Mon Feb 9 21:06:59 UTC 2009
- Previous message (by thread): rpms/scidavis/devel scidavis.spec, 1.12, 1.13 scidavis-0.1.3-pro.patch, 1.2, NONE scidavis-0.1.3-sip.patch, 1.3, NONE
- Next message (by thread): rpms/kernel/devel config-x86-generic, 1.66, 1.67 kernel.spec, 1.1280, 1.1281
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tanguy
Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18430
Modified Files:
.cvsignore sources
Added Files:
scidavis-0.1.4-pro.patch
Log Message:
scidavis-0.1.4-pro.patch:
--- NEW FILE scidavis-0.1.4-pro.patch ---
--- scidavis-0.1.4/scidavis/scidavis.pro 2008-09-12 17:51:05.000000000 +0200
+++ scidavis-0.1.4/scidavis/scidavis.pro.new 2009-02-09 16:44:40.000000000 +0100
@@ -13,7 +13,7 @@
### what to install
INSTALLS += target # this is the program itself
-INSTALLS += documentation # README, INSTALL.html, manual (if present in the manual subfolder), etc.
+#INSTALLS += documentation # README, INSTALL.html, manual (if present in the manual subfolder), etc.
### Comment out the next line if you do not want automatic compilation and installation of the translations
INSTALLS += translationfiles
@@ -42,7 +42,7 @@
win32: documentation.path = "$$INSTALLBASE" # ... on Winodws
### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
### You can override this, uncomment and adjust the path behind the '=' in the next line.
-# manual.path = $$INSTALLBASE/share/doc/scidavis/manual
+manual.path = $$INSTALLBASE/share/doc/scidavis-manual-0.1.4
### Important: translationfiles.path will be the directory where scidavis expects
### the translation .qm files at runtime. Therefore you need to set it corretly even if
### you do not use this project file to generate the translation files.
@@ -77,30 +77,31 @@
### are compiled against Qt4), dynamically against everything else.
#############################################################################
-unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:INCLUDEPATH += ../3rdparty/qwt/src
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH += ../3rdparty/qwt/src
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS += -L/usr/lib$${libsuff}
-unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+#unix:LIBS += -L/usr/lib$${libsuff}
+#unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
#############################################################################
### Link everything dynamically
#############################################################################
-#unix:INCLUDEPATH += /usr/include/qwt5
-#unix:LIBS += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH += /usr/include/qwt
+unix:INCLUDEPATH += /usr/include/qwtplot3d
+unix:LIBS += -L/usr/lib$${libsuff}
## dynamically link against Qwt(3D) installed system-wide
## WARNING: make sure they are compiled against >= Qt4.2
## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also
## cause problems.
#unix:INCLUDEPATH += /usr/include/qwtplot3d
-#unix:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
+unix:LIBS += -lqwtplot3d-qt4
+unix:LIBS += -lqwt
##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
#############################################################################
### Default settings for Windows
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 24 Apr 2008 07:11:39 -0000 1.3
+++ .cvsignore 9 Feb 2009 21:06:29 -0000 1.4
@@ -1,2 +1,2 @@
-scidavis-0.1.3.tar.bz2
+scidavis-0.1.4.tar.bz2
scidavis-manual-0.1_2008-02-28.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 24 Apr 2008 07:11:40 -0000 1.3
+++ sources 9 Feb 2009 21:06:29 -0000 1.4
@@ -1,2 +1,2 @@
-4aac6ab3a06c6df66fd3a7b91bdccc94 scidavis-0.1.3.tar.bz2
+18d884adbd33d0c63cddc7a4c6f2a08e scidavis-0.1.4.tar.bz2
3527477cb0685da3ddfb0ee398ba6303 scidavis-manual-0.1_2008-02-28.tar.bz2
- Previous message (by thread): rpms/scidavis/devel scidavis.spec, 1.12, 1.13 scidavis-0.1.3-pro.patch, 1.2, NONE scidavis-0.1.3-sip.patch, 1.3, NONE
- Next message (by thread): rpms/kernel/devel config-x86-generic, 1.66, 1.67 kernel.spec, 1.1280, 1.1281
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list