rpms/qtoctave/devel qtoctave-includes.patch, 1.2, 1.3 qtoctave.spec, 1.6, 1.7

[nucleo]

Author: nucleo

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

Modified Files:
	qtoctave-includes.patch qtoctave.spec 
Log Message:
fix for Qt 4.6

qtoctave-includes.patch:
 CMakeLists.txt                       |    4 ++--
 easy_plot/src/gnuplot_connection.cpp |    1 +
 qtoctave/src/search_dialog.cpp       |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

Index: qtoctave-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qtoctave-includes.patch	28 Jan 2010 02:58:11 -0000	1.2
+++ qtoctave-includes.patch	28 Jan 2010 03:46:56 -0000	1.3
@@ -16,3 +16,21 @@
  
  SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
  {
+--- qtoctave-0.8.2/CMakeLists.txt	2009-06-29 18:26:22.000000000 +0300
++++ qtoctave-0.8.2/CMakeLists.txt	2010-01-28 05:28:05.000000000 +0200
+@@ -28,13 +28,13 @@
+ 
+ include(UseQt4)
+ 
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5   )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
+ 	MESSAGE (FATAL_ERROR 
+ 			"Qt version 4.5 required.\n"
+ 			"Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ 			"Please install required version.\n"
+ 		)
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5   )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
+ 
+ 
+ 


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qtoctave.spec	28 Jan 2010 02:58:11 -0000	1.6
+++ qtoctave.spec	28 Jan 2010 03:46:56 -0000	1.7
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  qt4-devel, octave-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  cmake
-Requires:       octave
+Requires:       octave >= 3.2.0
 
 Patch0:         qtoctave-includes.patch