diff --git a/.cvsignore b/.cvsignore index e69de29..c73df6b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +colormaps.tgz +qtiplot-0.9.tar.bz2 diff --git a/qtiplot-path.patch b/qtiplot-path.patch new file mode 100644 index 0000000..688f897 --- /dev/null +++ b/qtiplot-path.patch @@ -0,0 +1,120 @@ +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 + +@@ -30,12 +30,12 @@ + #!!! Warning: You must modify these paths according to your computer settings + ############################################################################# + +-INCLUDEPATH += ../3rdparty/muparser/include +-INCLUDEPATH += ../3rdparty/qwtplot3d/include +-INCLUDEPATH += ../3rdparty/qwt/src +-INCLUDEPATH += ../3rdparty/liborigin +-INCLUDEPATH += ../3rdparty/gsl/include +-INCLUDEPATH += ../3rdparty/zlib123/include ++INCLUDEPATH += MUPARSERINC ++INCLUDEPATH += QWTPLOT3DINC ++INCLUDEPATH += QWTINC ++INCLUDEPATH += ../3rdparty/liborigin ++INCLUDEPATH += GSLINC ++INCLUDEPATH += ZLIBINC + + ##################### 3rd PARTY LIBRARIES SECTION ########################### + #!!! Warning: You must modify these paths according to your computer settings +@@ -44,17 +44,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 += ../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 + + # 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 \ + + SOURCES += src/muParserScript.cpp \ diff --git a/qtiplot.desktop b/qtiplot.desktop new file mode 100644 index 0000000..6159e0b --- /dev/null +++ b/qtiplot.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=QtiPlot +GenericName=QtiPlot - Data Analysis and Scientific Plotting +Exec=qtiplot +Terminal=false +Type=Application +Categories=Education; +Icon=qtiplot_logo.png diff --git a/qtiplot.spec b/qtiplot.spec new file mode 100644 index 0000000..16272f7 --- /dev/null +++ b/qtiplot.spec @@ -0,0 +1,154 @@ +Name: qtiplot +Summary: Data Analysis and Scientific Plotting +Version: 0.9 +Release: 8%{?dist} +#>4.2 is needed for qtiplot +BuildRequires: qt4-devel >= 4.2 +BuildRequires: qwt-devel +BuildRequires: qwtplot3d-qt4-devel +BuildRequires: gsl-devel +BuildRequires: muParser-devel +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +#python-devel comes with sip-devel +#BuildRequires: python-devel +BuildRequires: PyQt4-devel +#sip-devel comes with PyQt4-devel +#BuildRequires: sip-devel + +%if 0%{?rhel} > 4 +%define epel5mode 1 +%else +%define epel5mode 0 +%endif + +URL: http://soft.proindependent.com/qtiplot.html +License: GPLv2+ +Group: Applications/Publishing +Source0: http://soft.proindependent.com/src/%{name}-%{version}.tar.bz2 +Source1: http://soft.proindependent.com/misc/colormaps.tgz +Source2: %{name}.desktop +Patch0: qtiplot-path.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Scientists often need to use data analysis and plotting software. +For Windows systems there is a well known and widely used software +called Origin, which is not free, of course. The purpose of this +project is to develop a free (open source), platform independent +alternative to Origin. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 +sed -i "s\MUPARSERINC\ %{_includedir}/\1" qtiplot/qtiplot.pro +sed -i "s\QWTPLOT3DINC\ %{_includedir}/qwtplot3d\1" qtiplot/qtiplot.pro +sed -i "s\QWTINC\ %{_includedir}/qwt\1" qtiplot/qtiplot.pro +#sed -i "s\LIBORGININC\ %{_includedir}/liborigin\1" qtiplot/qtiplot.pro +sed -i "s\GSLINC\ %{_includedir}/gls\1" qtiplot/qtiplot.pro +sed -i "s\ZLIBINC\ %{_includedir}/\1" qtiplot/qtiplot.pro +sed -i "s\DOCDIR\ $RPM_BUILD_ROOT/%{_docdir}/%{name}/\1" qtiplot/qtiplot.pro +sed -i "s\BINDIR\ $RPM_BUILD_ROOT/%{_bindir}\1" qtiplot/qtiplot.pro +sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational1/fitRational1.pro +sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational0/fitRational0.pro +#fix default path for the Plug-Ins +sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/ApplicationWindow.cpp +#fix source files for debug package +dos2unix qtiplot/src/* +dos2unix fitPlugins/fitRational0/* +dos2unix fitPlugins/fitRational1/* +dos2unix 3rdparty/zlib123/*.c +dos2unix 3rdparty/zlib123/include/* +dos2unix 3rdparty/liborigin/* +chmod 0644 qtiplot/src/* +chmod 0644 fitPlugins/fitRational0/* +chmod 0644 fitPlugins/fitRational1/* +chmod 0644 3rdparty/zlib123/*.c +chmod 0644 3rdparty/zlib123/include/* +chmod 0644 3rdparty/liborigin/* + + +%build +%if %{epel5mode} +%{_libdir}/qt4/bin/qmake +%else +qmake-qt4 +%endif +make %{?_smp_mflags} +lrelease-qt4 qtiplot/translations/*.ts + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/qt4/translations +cp -p qtiplot/translations/*.qm $RPM_BUILD_ROOT/%{_datadir}/qt4/translations/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} +tar -xf %{SOURCE1} -C $RPM_BUILD_ROOT/%{_datadir}/%{name} +#fix permission of the doc files +chmod 0644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/README.html +chmod 0644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/gpl_licence.txt +#fix file encoding files +dos2unix $RPM_BUILD_ROOT/%{_docdir}/%{name}/gpl_licence.txt + +#remove symlinks +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so.1 +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so.1.0 +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so.1 +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so.1.0 + +#for the icon +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps +install -m 0644 -p qtiplot_logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/qtiplot_logo.png + +#post -p /sbin/ldconfig +#postun -p /sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%{_docdir}/%{name} +%{_libdir}/%{name} +%{_bindir}/qtiplot +%{_datadir}/applications/* +%{_datadir}/qt4/translations/* +%{_datadir}/pixmaps/* +%{_datadir}/%{name} + + +%changelog +* Sat Oct 20 2007 Frank Büttner - 0.9-8 + - fix encoding of the source files for debug package + - fix permission of the source files for debug package + - add icon for the menue entry +* Sun Oct 06 2007 Frank Büttner - 0.9-7 + - enable build for epel + - push the plug-ins to an extra directory +* Sun Oct 06 2007 Frank Büttner - 0.9-6 + - enable parllel build + - set vendor_id at the desktop file + - remove redundant BuildRequires + - clean build root before call install + - fix permission of the doc files + - fix file encoding of the licence file + - fix spec file(use only tabs as seperator) + - fix patch to link the libfitRational1 correct + - remove unneeded symlinks + - remove unneeded ldconfig +* Sat Oct 06 2007 Frank Büttner - 0.9-5 + - adapt it to the qwtplot3d package + - fix the path patch for 0.9 final +* Sun Sep 30 2007 Frank Büttner - 0.9-4 + - update to the final 0.9 + - enable Python support + - fix spec file +* Sat Jun 09 2007 Frank Büttner - 0.9_rc1-3%{?dist} + - split to doc part to an extra package +* Mon May 21 2007 Frank Büttner - 0.9_rc1-2%{?dist} + - split doc package as noarch rpm +* Wed May 16 2007 Frank Büttner - 0.9_rc1-1%{?dist} + - start diff --git a/sources b/sources index e69de29..5e734b1 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +14e213a6fbbcce5824340768be528361 colormaps.tgz +117601fb9ba06b41f99e5492920f0864 qtiplot-0.9.tar.bz2