[paraview: 8/8] Merge branch 'f16'

[Orion Poplawski]

commit 4e17c8f583814efafba649662251daf009f08f1d
Merge: e3f9ff3 d498313
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Dec 9 14:44:49 2011 -0700

    Merge branch 'f16'

 paraview.spec |  119 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 77 insertions(+), 42 deletions(-)
---
diff --cc paraview.spec
index 0ed0a81,67a7204..40dbe52
--- a/paraview.spec
+++ b/paraview.spec
@@@ -53,17 -50,12 +53,16 @@@ BuildRequires:  openssl-deve
  BuildRequires:  gnuplot
  BuildRequires:  wget
  BuildRequires:  boost-devel
 +BuildRequires:  libjpeg-devel
 +BuildRequires:  libpng-devel
 +BuildRequires:  libtheora-devel
 +Requires:       hdf5 = %{_hdf5_version}
  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-devel < %{version}-%{release}
  Obsoletes:      paraview-doc < %{version}-%{release}
  Provides:       paraview-doc = %{version}-%{release}