rpms/qtiplot/devel qtiplot-includes.patch, NONE, 1.1 qtiplot.spec, 1.3, 1.4

Caolan McNamara caolanm at fedoraproject.org
Mon Dec 15 13:36:50 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21707

Modified Files:
	qtiplot.spec 
Added Files:
	qtiplot-includes.patch 
Log Message:
rebuild

qtiplot-includes.patch:

--- NEW FILE qtiplot-includes.patch ---
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 <iostream>
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
+#include <strings.h>
 
 #include <algorithm> //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<MyWidget*> MDIWindowList;
+
 class FolderListItem;
 class Table;
 class Matrix;


Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtiplot.spec	1 Dec 2008 05:03:51 -0000	1.3
+++ qtiplot.spec	15 Dec 2008 13:36:20 -0000	1.4
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Mon Dec 15 2008 Caolán McNamara <caolanm at redhat.com> - 0.9-11
+- rebuild
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-10
 - Rebuild for Python 2.6
 




More information about the fedora-extras-commits mailing list