[paraview/f16] - BR/R desktop-file-utils instead of /usr/bin/update-desktop-database - Drop Requires on /usr/bin/up

[Orion Poplawski]

commit 693fb8a3e23af8c6a6bf13ab88542cccc5023402
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Dec 6 09:36:41 2011 -0700

    - BR/R desktop-file-utils instead of /usr/bin/update-desktop-database
    - Drop Requires on /usr/bin/update-mime-database
    - Specify install include dir for mpi installs
    - Fixup cleanups
    - paraview.qch in doc dir in -devel

 paraview.spec |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index caaf216..8b12068 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -43,7 +43,7 @@ BuildRequires:  mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
-BuildRequires:  /usr/bin/desktop-file-install
+BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen, graphviz
 BuildRequires:  readline-devel
 BuildRequires:  openssl-devel
@@ -52,8 +52,8 @@ BuildRequires:  wget
 BuildRequires:  boost-devel
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
-Requires(post):   /usr/bin/update-desktop-database
-Requires(postun): /usr/bin/update-desktop-database
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
 Obsoletes:      paraview-demos < %{version}-%{release}
 Provides:       paraview-demos = %{version}-%{release}
 Obsoletes:      paraview-doc < %{version}-%{release}
@@ -89,7 +89,6 @@ Provides:       paraview-doc = %{version}-%{release}
         -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
         -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\
         -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\
-        -DPV_INSTALL_INCLUDE_DIR:PATH=include/paraview \\\
         -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\
         -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \\\
         -DVTK_USE_BOOST:BOOL=ON \\\
@@ -134,8 +133,6 @@ Install the paraview-mpich2 package to get a version compiled with mpich2.
 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
 BuildArch:      noarch
 
 %description    data
@@ -156,8 +153,6 @@ developing applications that use %{name}.
 Summary:        Documentation files for ParaView
 Group:          Applications/Engineering
 Requires:       %{name} = %{version}-%{release}
-Requires(post):   /usr/bin/update-mime-database
-Requires(postun): /usr/bin/update-mime-database
 BuildArch:      noarch
 
 %description    doc
@@ -232,6 +227,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 mkdir fedora
 pushd fedora
 %cmake .. \
+        -DPV_INSTALL_INCLUDE_DIR:PATH=include/paraview \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
         %{paraview_cmake_options}
 make VERBOSE=1 %{?_smp_mflags}
@@ -242,6 +238,7 @@ pushd fedora-openmpi
 %{_openmpi_load}
 %cmake .. \
         -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/openmpi/bin \
+        -DPV_INSTALL_INCLUDE_DIR:PATH=%{_lib}/openmpi/include/paraview \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/openmpi/lib/paraview \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
@@ -259,6 +256,7 @@ pushd fedora-mpich2
 %{_mpich2_load}
 %cmake .. \
         -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/mpich2/bin \
+        -DPV_INSTALL_INCLUDE_DIR:PATH=%{_lib}/mpich2/include/paraview \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/mpich2/lib/paraview \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
@@ -293,7 +291,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT%{_libdir}/openmpi/bin
 #Don't need mpi versions of these
-rm paraview pvblot pvpython
+rm paraview pvblot pvpython kw* vtk*
 #Move the remaining mpi binaries out of the way
 for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
 do
@@ -301,8 +299,7 @@ do
 done
 popd
 
-#Remove mpi copy of includes, man pages, and documentation
-rm -rf $RPM_BUILD_ROOT%{_includedir}/paraview-%{pv_majmin}
+#Remove mpi copy of man pages
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
 #Install libvtk*Python.so by hand for now
@@ -318,7 +315,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT%{_libdir}/mpich2/bin
 #Don't need mpi versions of these
-rm paraview pvblot pvpython
+rm paraview pvblot pvpython kw* vtk*
 #Move the remaining mpi binaries out of the way
 for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
 do
@@ -326,8 +323,7 @@ do
 done
 popd
 
-#Remove mpi copy of includes, man pages, and documentation
-rm -rf $RPM_BUILD_ROOT%{_includedir}/paraview-%{pv_majmin}
+#Remove mpi copy of man pages
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
 #Install libvtk*Python.so by hand for now
@@ -361,6 +357,9 @@ desktop-file-install --vendor=fedora \
 
 #Install libvtk*Python.so by hand for now
 cp -p bin/libvtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/
+
+#Cleanup vtk binaries
+rm $RPM_BUILD_ROOT%{_bindir}/vtk*
 popd
 
 
@@ -412,6 +411,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files devel
 %{_includedir}/paraview/
+%{_datadir}/doc/paraview-%{pv_majmin}/
 
 
 %if %{build_openmpi}