rpms/scidavis/F-13 scidavis-fitPlugins.patch, NONE, 1.1 scidavis-manual.patch, NONE, 1.1 scidavis-pro.patch, NONE, 1.1
supercyper
supercyper at fedoraproject.org
Sun Mar 14 06:27:34 UTC 2010
- Previous message: rpms/scidavis/F-12 scidavis-fitPlugins.patch, NONE, 1.1 scidavis-manual.patch, NONE, 1.1 scidavis-pro.patch, NONE, 1.1
- Next message: rpms/scidavis/F-11 scidavis-fitPlugins.patch, NONE, 1.1 scidavis-manual.patch, NONE, 1.1 scidavis-pro.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: supercyper
Update of /cvs/pkgs/rpms/scidavis/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21914
Added Files:
scidavis-fitPlugins.patch scidavis-manual.patch
scidavis-pro.patch
Log Message:
scidavis-fitPlugins.patch:
exp_saturation/exp_saturation.pro | 5 ++---
explin/explin.pro | 5 ++---
fitRational0/fitRational0.pro | 5 ++---
fitRational1/fitRational1.pro | 5 ++---
planck_wavelength/planck_wavelength.pro | 5 ++---
5 files changed, 10 insertions(+), 15 deletions(-)
--- NEW FILE scidavis-fitPlugins.patch ---
diff -Naur scidavis-0.2.4.org/fitPlugins/explin/explin.pro scidavis-0.2.4/fitPlugins/explin/explin.pro
--- scidavis-0.2.4.org/fitPlugins/explin/explin.pro 2009-05-30 17:35:08.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/explin/explin.pro 2010-03-13 19:53:19.899694554 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = explin
TEMPLATE = lib
@@ -9,13 +8,13 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = explin.c
diff -Naur scidavis-0.2.4.org/fitPlugins/exp_saturation/exp_saturation.pro scidavis-0.2.4/fitPlugins/exp_saturation/exp_saturation.pro
--- scidavis-0.2.4.org/fitPlugins/exp_saturation/exp_saturation.pro 2009-05-30 17:35:08.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/exp_saturation/exp_saturation.pro 2010-03-13 19:53:52.520687017 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = exp_saturation
TEMPLATE = lib
@@ -9,12 +8,12 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = exp_saturation.c
diff -Naur scidavis-0.2.4.org/fitPlugins/fitRational0/fitRational0.pro scidavis-0.2.4/fitPlugins/fitRational0/fitRational0.pro
--- scidavis-0.2.4.org/fitPlugins/fitRational0/fitRational0.pro 2009-04-09 14:26:11.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/fitRational0/fitRational0.pro 2010-03-13 19:54:25.156689749 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = fitRational0
TEMPLATE = lib
@@ -25,10 +24,10 @@
# Dynamically link against GSL installed system-wide.
# This is used as default on unix systems such as
# Linux, Mac OS X and *BSD.
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
# where to install the plugins
-unix:target.path=/usr/lib$${libsuff}/scidavis/plugins
+unix:target.path=$$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
SOURCES += fitRational0.cpp
diff -Naur scidavis-0.2.4.org/fitPlugins/fitRational1/fitRational1.pro scidavis-0.2.4/fitPlugins/fitRational1/fitRational1.pro
--- scidavis-0.2.4.org/fitPlugins/fitRational1/fitRational1.pro 2009-04-09 14:26:11.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/fitRational1/fitRational1.pro 2010-03-13 19:54:50.414685870 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = fitRational1
TEMPLATE = lib
@@ -25,10 +24,10 @@
# Dynamically link against GSL installed system-wide.
# This is used as default on unix systems such as
# Linux, Mac OS X and *BSD.
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
# where to install the plugins
-unix:target.path=/usr/lib$${libsuff}/scidavis/plugins
+unix:target.path=$$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
SOURCES += fitRational1.cpp
diff -Naur scidavis-0.2.4.org/fitPlugins/planck_wavelength/planck_wavelength.pro scidavis-0.2.4/fitPlugins/planck_wavelength/planck_wavelength.pro
--- scidavis-0.2.4.org/fitPlugins/planck_wavelength/planck_wavelength.pro 2009-05-30 17:44:16.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/planck_wavelength/planck_wavelength.pro 2010-03-13 19:55:18.184687287 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = planck_wavelength
TEMPLATE = lib
@@ -9,13 +8,13 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = planck_wavelength.c
scidavis-manual.patch:
Makefile | 2 ++
docbook-en/index.docbook | 2 +-
scidavis.dsl | 2 +-
scidavis_html.xsl | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE scidavis-manual.patch ---
diff -Naur manual/docbook-en/index.docbook manual/docbook-en/index.docbook
--- manual/docbook-en/index.docbook 2009-10-05 04:36:15.000000000 +0800
+++ manual/docbook-en/index.docbook 2010-03-13 20:33:02.842689502 +0800
@@ -8,7 +8,7 @@
*************************************************************************
-->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/sgml/docbook/xml-dtd-4.3-VER-REL/docbookx.dtd" [
<!--
general terms for the application
-->
diff -Naur manual/Makefile manual/Makefile
--- manual/Makefile 2008-08-30 00:22:33.000000000 +0800
+++ manual/Makefile 2010-03-13 20:36:38.649942308 +0800
@@ -13,3 +13,5 @@
pdf-en:
dblatex -o ${BASE}.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
+install:
+
diff -Naur manual/scidavis.dsl manual/scidavis.dsl
--- manual/scidavis.dsl 2008-08-30 00:22:33.000000000 +0800
+++ manual/scidavis.dsl 2010-03-13 20:35:49.601687959 +0800
@@ -6,7 +6,7 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
+<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets-1.79/html/docbook.dsl" CDATA DSSSL>
<!--ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets-1.79/html/docbook.dsl" CDATA DSSSL-->
<!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
diff -Naur manual/scidavis_html.xsl manual/scidavis_html.xsl
--- manual/scidavis_html.xsl 2009-10-05 04:36:15.000000000 +0800
+++ manual/scidavis_html.xsl 2010-03-13 20:34:17.522689162 +0800
@@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/chunk.xsl"/>
<xsl:output method="html" encoding="UTF-8" indent="yes"/>
scidavis-pro.patch:
scidavis.pro | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
--- NEW FILE scidavis-pro.patch ---
--- scidavis-0.2.4.org/scidavis/scidavis.pro 2009-10-06 23:24:55.000000000 +0800
+++ scidavis-0.2.4/scidavis/scidavis.pro 2010-03-14 11:53:33.744272042 +0800
@@ -30,23 +30,23 @@
}
### 64 Linux only suffix
-linux-g++-64: libsuff = 64
+#linux-g++-64: libsuff = 64
### where to install
unix: INSTALLBASE = /usr # this is what is called "prefix" when using GNU autotools
win32: INSTALLBASE = c:/scidavis
unix: target.path = "$$INSTALLBASE/bin" # where to install the binary on Linux/MacOS X
win32: target.path = "$$INSTALLBASE" # where to install the exe on Windows
-unix: documentation.path = "$$INSTALLBASE/share/doc/scidavis" # where to install the documentation files on Linux/MacOS X
+unix: documentation.path = "$$SCIDOCDIR" # where to install the documentation files on Linux/MacOS X
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 = $$SCIDOCDIR/manual
### Enables choosing of help folder at runtime, instead of relying on the above path only.
### The downside is that the help folder will be remembered as a configuration option, so a binary
### package cannot easily update the path for its users.
### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
-DEFINES += DYNAMIC_MANUAL_PATH
+#DEFINES += DYNAMIC_MANUAL_PATH
### 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.
@@ -87,32 +87,32 @@
### 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
-unix:LIBS += -lmuparser
+#unix:LIBS += -L/usr/lib$${libsuff}
+#unix:LIBS += -lgsl -lgslcblas -lz
+#unix:LIBS += -lmuparser
unix:INCLUDEPATH += /usr/include/muParser
#############################################################################
### Link everything dynamically
#############################################################################
-#unix:INCLUDEPATH += /usr/include/qwt5
+unix:INCLUDEPATH += /usr/include/qwt
#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:INCLUDEPATH += /usr/include/qwtplot3d
+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
- Previous message: rpms/scidavis/F-12 scidavis-fitPlugins.patch, NONE, 1.1 scidavis-manual.patch, NONE, 1.1 scidavis-pro.patch, NONE, 1.1
- Next message: rpms/scidavis/F-11 scidavis-fitPlugins.patch, NONE, 1.1 scidavis-manual.patch, NONE, 1.1 scidavis-pro.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list