From 4d9f1ad7f97604821a92fa5893fe46ee74db9d00 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Dec 15 2008 13:36:20 +0000 Subject: rebuild --- diff --git a/qtiplot-includes.patch b/qtiplot-includes.patch new file mode 100644 index 0000000..ca9d965 --- /dev/null +++ b/qtiplot-includes.patch @@ -0,0 +1,24 @@ +diff -ru qtiplot-0.9.orig/3rdparty/liborigin/OPJFile.cpp qtiplot-0.9/3rdparty/liborigin/OPJFile.cpp +--- qtiplot-0.9.orig/3rdparty/liborigin/OPJFile.cpp 2008-12-15 12:14:03.000000000 +0000 ++++ qtiplot-0.9/3rdparty/liborigin/OPJFile.cpp 2008-12-15 12:14:51.000000000 +0000 +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + + #include //required for std::swap + #include "OPJFile.h" +diff -ru qtiplot-0.9.orig/qtiplot/src/Folder.h qtiplot-0.9/qtiplot/src/Folder.h +--- qtiplot-0.9.orig/qtiplot/src/Folder.h 2008-12-15 12:14:02.000000000 +0000 ++++ qtiplot-0.9/qtiplot/src/Folder.h 2008-12-15 12:53:40.000000000 +0000 +@@ -44,6 +44,8 @@ + + #include "MyWidget.h" + ++typedef QList MDIWindowList; ++ + class FolderListItem; + class Table; + class Matrix; diff --git a/qtiplot.spec b/qtiplot.spec index 4566fbc..a0846ba 100644 --- a/qtiplot.spec +++ b/qtiplot.spec @@ -1,7 +1,7 @@ Name: qtiplot Summary: Data Analysis and Scientific Plotting Version: 0.9 -Release: 10%{?dist} +Release: 11%{?dist} #>4.2 is needed for qtiplot BuildRequires: qt4-devel >= 4.2 BuildRequires: qwt-devel @@ -29,6 +29,7 @@ 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 +Patch1: qtiplot-includes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -41,6 +42,7 @@ alternative to Origin. %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -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 @@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 15 2008 Caolán McNamara - 0.9-11 +- rebuild + * Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.9-10 - Rebuild for Python 2.6