rpms/qtoctave/devel qtoctave-qt-version.patch, NONE, 1.1 qtoctave.spec, 1.9, 1.10

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/qtoctave/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16126

Modified Files:
	qtoctave.spec 
Added Files:
	qtoctave-qt-version.patch 
Log Message:
fix build with different Qt versions

qtoctave-qt-version.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qtoctave-qt-version.patch ---
--- qtoctave-0.9.1/CMakeLists.txt	2010-01-25 15:19:48.000000000 +0200
+++ qtoctave-0.9.1/CMakeLists.txt	2010-04-21 00:33:08.000000000 +0300
@@ -28,13 +28,13 @@
 
 include(UseQt4)
 
-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
+if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
 	MESSAGE (FATAL_ERROR 
 			"Qt version 4.6 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 6   )
+endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
 
 add_subdirectory (qtoctave_pkg/src)
 add_subdirectory (xmlwidget/qt4)


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/devel/qtoctave.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qtoctave.spec	20 Apr 2010 21:23:21 -0000	1.9
+++ qtoctave.spec	20 Apr 2010 21:36:02 -0000	1.10
@@ -17,6 +17,8 @@ Requires:       octave >= 3.2.0
 
 # place qtoctave_doc in qtoctave datadir
 Patch0:         qtoctave-0.9.1-doc-path.patch
+# fix build with different Qt versions
+Patch1:         qtoctave-qt-version.patch
 
 %description
 QtOctave is a frontend for Octave based on Qt4.
@@ -24,6 +26,7 @@ QtOctave is a frontend for Octave based 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 find xmlwidget/qt4/src/ -type f -exec chmod a-x {} \;
 find easy_plot/src/ -type f -exec chmod a-x {} \;