rpms/paraview/FC-5 paraview.spec,1.2,1.3

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/paraview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28139

Modified Files:
	paraview.spec 
Log Message:
- Enable ppc (bug #189160 fixed)
- No OSMesa support in FC5
- Make data sub-package pull in main package (bug #193837)
- A patch from CVS to fix vtkXOpenRenderWindow.cxx



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/FC-5/paraview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paraview.spec	17 Apr 2006 22:24:33 -0000	1.2
+++ paraview.spec	29 Jun 2006 20:20:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -12,6 +12,7 @@
 Patch0:         paraview-2.4.2-tcltk.patch
 Patch1:         paraview-2.4.3-png.patch
 Patch2:         paraview-2.4.3-python.patch
+Patch3:         paraview-2.4.3-xopengl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, lam
@@ -20,7 +21,6 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
-ExcludeArch:    ppc
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
@@ -75,6 +75,7 @@
 %package        data
 Summary:        Data files for ParaView
 Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
 Requires(post):   /usr/bin/update-mime-database
 Requires(postun): /usr/bin/update-mime-database
 
@@ -96,6 +97,7 @@
 %patch -p1 -b .tcltk
 %patch1 -p1 -b .png
 %patch2 -p1 -b .python
+%patch3 -p1 -b .xopengl
 rm -rf Utilities/TclTk
 sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt
 
@@ -120,7 +122,6 @@
         -DTCL_LIBRARY:PATH=tcl \
         -DTK_LIBRARY:PATH=tk \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
-        -DVTK_USE_MAGLED_MESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -155,7 +156,6 @@
         -DVTK_USE_MPI:BOOL=ON \
         -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \
         -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \
-        -DVTK_USE_MAGLED_MESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
         -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -310,6 +310,12 @@
 
 
 %changelog
+* Thu Jun 29 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-7
+- Enable ppc (bug #189160 fixed)
+- No OSMesa support in FC5
+- Make data sub-package pull in main package (bug #193837)
+- A patch from CVS to fix vtkXOpenRenderWindow.cxx
+
 * Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
 - Exclude ppc due to gcc bug #189160