diff --git a/scidavis-0.1.3-sip.patch b/scidavis-0.1.3-sip.patch index b5b875e..ce32698 100644 --- a/scidavis-0.1.3-sip.patch +++ b/scidavis-0.1.3-sip.patch @@ -1,44 +1,29 @@ ---- scidavis-0.1.3.orig/scidavis/src/scidavis.sip 2007-07-21 21:32:13.000000000 +0100 -+++ scidavis-0.1.3/scidavis/src/scidavis.sip 2009-01-07 11:12:51.000000000 +0000 -@@ -78,8 +78,6 @@ - MyWidget(const MyWidget&); - }; - --typedef QList MDIWindowList; -- - class Table: MyWidget - { - %TypeHeaderCode -@@ -1027,7 +1025,6 @@ - SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4)) +--- scidavis-0.1.3/scidavis/src/scidavis.sip 2008/09/27 20:04:46 991 ++++ scidavis-0.1.3/scidavis/src/scidavis.sip 2009/01/10 23:08:56 1023 +@@ -1028,7 +1028,7 @@ %End -- void setMethod(int n); - void setMethod(InterpolationMethod m); + void setMethod(int n); +- void setMethod(InterpolationMethod m); ++ void setMethod(InterpolationMethod m /Constrained/); bool run(); }; -@@ -1051,7 +1048,6 @@ - SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4)) + +@@ -1052,7 +1052,7 @@ %End -- void setMethod(int); - void setMethod(SmoothMethod); + void setMethod(int); +- void setMethod(SmoothMethod); ++ void setMethod(SmoothMethod /Constrained/); void setSmoothPoints(int, int = 0); -@@ -1079,7 +1075,6 @@ - SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4)) + void setPolynomOrder(int); +@@ -1080,7 +1080,7 @@ %End -- void setFilterType(int); - void setFilterType(FilterType); + void setFilterType(int); +- void setFilterType(FilterType); ++ void setFilterType(FilterType /Constrained/); void setCutoff(double); -@@ -1194,7 +1189,7 @@ - #include "src/Folder.h" - %End - public: -- MDIWindowList windowsList() /PyName=windows/; -+ QList windowsList() /PyName=windows/; - // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly - // void setFolderName(const QString&) /PyName=setName/; - QString name(); + void setBand(double, double); diff --git a/scidavis.spec b/scidavis.spec index d04ecb7..88e06ea 100644 --- a/scidavis.spec +++ b/scidavis.spec @@ -1,7 +1,7 @@ Summary: Scientific Data Analysis and Visualization Name: scidavis Version: 0.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Source0: http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2 Patch0: scidavis-0.1.3-pro.patch @@ -100,6 +100,9 @@ rm -rf %{buildroot} %doc manual/* %changelog +* Sun Jan 11 2009 Eric Tanguy - 0.1.3-6 +- Replace the sip patch by the one from upstream + * Wed Jan 07 2009 Eric Tanguy - 0.1.3-5 - Rebuild