From 036a68699975f3a2b505c7f3cad7c48052bc44ea Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Dec 22 2006 22:01:08 +0000
Subject: - Fix .so permissions

- Patch for const issue
- Patch for new cmake
- Build with openmpi

---

diff --git a/paraview-2.4.4-cmake245.patch b/paraview-2.4.4-cmake245.patch
new file mode 100644
index 0000000..7781641
--- /dev/null
+++ b/paraview-2.4.4-cmake245.patch
@@ -0,0 +1,38 @@
+--- paraview-2.4.4/Utilities/IceT/doc/man/CMakeLists.txt.cmake245	2005-08-03 07:07:15.000000000 -0600
++++ paraview-2.4.4/Utilities/IceT/doc/man/CMakeLists.txt	2006-12-19 16:46:59.000000000 -0700
+@@ -45,17 +45,21 @@
+ MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/man7)
+ 
+ MACRO(ICET_LINK_MAN3_FILE srcfile destfile)
+-  ADD_CUSTOM_TARGET(man3/${destfile}.3 ALL
+-    ln -sf ${ICET_SOURCE_DIR}/doc/man/man3/${srcfile}.3 man3/${destfile}.3
++  ADD_CUSTOM_COMMAND(
++    OUTPUT man3/${destfile}.3
++    COMMAND ln
++    ARGS -sf ${ICET_SOURCE_DIR}/doc/man/man3/${srcfile}.3 man3/${destfile}.3
+     DEPENDS man3)
+-  INSTALL_FILES(/man/man3 FILES ${ICET_BINARY_DIR}/doc/man/man3/${destfile}.3)
++  INSTALL_FILES(/share/man/man3 FILES ${ICET_BINARY_DIR}/doc/man/man3/${destfile}.3)
+ ENDMACRO(ICET_LINK_MAN3_FILE)
+ 
+ MACRO(ICET_LINK_MAN7_FILE srcfile destfile)
+-  ADD_CUSTOM_TARGET(man7/${destfile}.7 ALL
+-    ln -sf ${ICET_SOURCE_DIR}/doc/man/man7/${srcfile}.7 man7/${destfile}.7
++  ADD_CUSTOM_COMMAND(
++    OUTPUT man7/${destfile}.7
++    COMMAND ln
++    ARGS -sf ${ICET_SOURCE_DIR}/doc/man/man7/${srcfile}.7 man7/${destfile}.7
+     DEPENDS man7)
+-  INSTALL_FILES(/man/man7 FILES ${ICET_BINARY_DIR}/doc/man/man7/${destfile}.7)
++  INSTALL_FILES(/share/man/man7 FILES ${ICET_BINARY_DIR}/doc/man/man7/${destfile}.7)
+ ENDMACRO(ICET_LINK_MAN7_FILE)
+ 
+ ICET_LINK_MAN3_FILE(icetBoundingBox icetBoundingBoxd)
+@@ -71,5 +75,5 @@
+ ICET_LINK_MAN7_FILE(ICE-T ice-t)
+ ICET_LINK_MAN7_FILE(ICE-T icet)
+ 
+-INSTALL_FILES(/man/man3 FILES ${MAN3_FILES})
+-INSTALL_FILES(/man/man7 FILES ${MAN7_FILES})
++INSTALL_FILES(/share/man/man3 FILES ${MAN3_FILES})
++INSTALL_FILES(/share/man/man7 FILES ${MAN7_FILES})
diff --git a/paraview-2.4.4-const.patch b/paraview-2.4.4-const.patch
new file mode 100644
index 0000000..faf1448
--- /dev/null
+++ b/paraview-2.4.4-const.patch
@@ -0,0 +1,12 @@
+diff -u -r1.76 vtkPythonUtil.cxx
+--- VTK/Common/vtkPythonUtil.cxx        4 Aug 2005 16:19:14 -0000       1.76
++++ VTK/Common/vtkPythonUtil.cxx        18 Dec 2006 20:16:46 -0000
+@@ -768,7 +768,7 @@
+     }
+   if (strcmp(name, "__doc__") == 0)
+     {
+-    char *doc = t->tp_doc;
++    const char *doc = t->tp_doc;
+     if (doc != NULL)
+       {
+       return PyString_FromString(doc);
diff --git a/paraview.spec b/paraview.spec
index ba45448..ca765c7 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -12,9 +12,11 @@ Source2:        paraview.xml
 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.4-const.patch
+Patch4:         paraview-2.4.4-cmake245.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake, lam-devel
+BuildRequires:  cmake, openmpi-devel
 BuildRequires:  libGLU-devel, libXt-devel, mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
@@ -96,6 +98,8 @@ Requires:       %{name}-data = %{version}-%{release}
 %patch -p1 -b .tcltk
 %patch1 -p1 -b .png
 %patch2 -p1 -b .python
+%patch3 -p0 -b .const
+%patch4 -p1 -b .cmake245
 rm -rf Utilities/TclTk
 sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt
 
@@ -135,7 +139,7 @@ popd
 mkdir fedora-mpi
 pushd fedora-mpi
 export CC='gcc'
-export CXX='g++'
+export CXX='mpic++'
 export MAKE='make'
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
@@ -152,8 +156,8 @@ cmake .. \
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
         -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
         -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" \
+        -DMPI_INCLUDE_PATH:PATH="%{_includedir}/openmpi" \
+        -DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \
         -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
         -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
         -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
@@ -242,6 +246,9 @@ desktop-file-install --vendor=fedora \
 
 popd
 
+# 'cmake' does not set +x permissions for libraries; hence they won't be stripped
+find $RPM_BUILD_ROOT%_libdir -name \*.so | xargs chmod +x
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -310,6 +317,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Dec 22 2006 - Orion Poplawski <orion@cora.wnra.com> - 2.4.4-5
+- Fix .so permissions
+- Patch for const issue
+- Patch for new cmake
+- Build with openmpi
+
 * Thu Dec 14 2006 - Jef Spaleta <jspaleta@gmail.com> - 2.4.4-4
 - Bump and build for python 2.5