diff --git a/qtiplot-path.patch b/qtiplot-path.patch index 549f0f4..93315ba 100644 --- a/qtiplot-path.patch +++ b/qtiplot-path.patch @@ -1,3 +1,49 @@ +diff -Naur qtiplot-0.9.7.4.org/fitPlugins/explin/explin.pro qtiplot-0.9.7.4/fitPlugins/explin/explin.pro +--- qtiplot-0.9.7.4.org/fitPlugins/explin/explin.pro 2009-01-10 15:14:17.000000000 +0100 ++++ qtiplot-0.9.7.4/fitPlugins/explin/explin.pro 2009-01-10 15:49:32.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 += explin.c +diff -Naur qtiplot-0.9.7.4.org/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro +--- qtiplot-0.9.7.4.org/fitPlugins/exp_saturation/exp_saturation.pro 2009-01-10 15:14:17.000000000 +0100 ++++ qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro 2009-01-10 15:49:44.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 += exp_saturation.c 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 diff --git a/qtiplot.spec b/qtiplot.spec index 495aa83..413975f 100644 --- a/qtiplot.spec +++ b/qtiplot.spec @@ -1,7 +1,7 @@ Name: qtiplot Summary: Data Analysis and Scientific Plotting Version: 0.9.7.4 -Release: 4%{?dist} +Release: 5%{?dist} #>4.2 is needed for qtiplot BuildRequires: qt4-devel >= 4.2 BuildRequires: qwt-devel @@ -66,9 +66,20 @@ sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRatio #fix default path for the Plug-Ins sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/core/ApplicationWindow.cpp #fix source files for debug package -dos2unix qtiplot/src/* +dos2unix qtiplot/src/analysis/*.h +dos2unix qtiplot/src/analysis/dialogs/*.h +dos2unix qtiplot/src/core/* +dos2unix qtiplot/src/matrix/* +dos2unix qtiplot/src/orin/* +dos2unix qtiplot/src/plot2D/*.h +dos2unix qtiplot/src/plot2D/dialogs/*.h +dos2unix qtiplot/src/plot3D/* +dos2unix qtiplot/src/scripting/* +dos2unix qtiplot/src/table/* dos2unix fitPlugins/fitRational0/* dos2unix fitPlugins/fitRational1/* +dos2unix fitPlugins/explin/* +dos2unix fitPlugins/exp_saturation/* dos2unix 3rdparty/zlib123/*.c dos2unix 3rdparty/zlib123/include/* dos2unix 3rdparty/liborigin/* @@ -133,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 10 2009 Frank Büttner - 0.9.7.4-5 + - fix dos2unix + * Sat Jan 10 2009 Frank Büttner - 0.9.7.4-4 - fix sed