rpms/paraview/devel paraview-3.4.0-qt.patch, NONE, 1.1 paraview.spec, 1.30, 1.31

[Orion Poplawski]

Author: orion

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

Modified Files:
	paraview.spec 
Added Files:
	paraview-3.4.0-qt.patch 
Log Message:
Add patch to allow build with Qt 4.5


paraview-3.4.0-qt.patch:

--- NEW FILE paraview-3.4.0-qt.patch ---
--- ParaView-3.4.0/CMakeLists.txt.qt	2008-09-12 07:33:51.000000000 -0600
+++ ParaView-3.4.0/CMakeLists.txt	2009-02-24 12:48:19.000000000 -0700
@@ -91,12 +91,7 @@
     # don't go greater than supported version
     STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")
     IF (NOT qt_version_tmp)
-      STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}")
-      IF (NOT qt_version4_4_tmp)
-        MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported.  Please use Qt 4.3 (you may need to clean your dirtied cache).")
-      ELSE (NOT qt_version4_4_tmp)
-        MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")
-      ENDIF (NOT qt_version4_4_tmp)
+      MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")
     ENDIF (NOT qt_version_tmp)
     # enforce Carbon in VTK for Qt/Mac
     IF(Q_WS_MAC)


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- paraview.spec	24 Feb 2009 17:20:12 -0000	1.30
+++ paraview.spec	24 Feb 2009 19:50:27 -0000	1.31
@@ -15,6 +15,8 @@
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
 Source1:        paraview_22x22.png
 Source2:        paraview.xml
+#Allow build with Qt 4.5
+Patch1:         paraview-3.4.0-qt.patch
 #Don't try to copy Qt libraries into paraview directory
 Patch2:         paraview-3.3.0-install.patch
 #Move pqClient.adp into %{_datadir}/paraview
@@ -105,6 +107,7 @@
 
 %prep
 %setup -q -n ParaView-%{version}
+%patch1 -p1 -b .qt
 %patch2 -p1 -b .install
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
@@ -324,6 +327,7 @@
 %changelog
 * Tue Feb 24 2009 Orion Poplawski <orion at cora.nwra.com> - 3.4.0-4
 - Rebuild with hdf 1.8.2, gcc 4.4.0
+- Add patch to allow build with Qt 4.5
 
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.0-3
 - rebuild with new openssl