From de5bda39c84810796fdefed1d762627d2166145f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Feb 19 2018 18:26:13 +0000
Subject: Rebuild for hdf5-1.8.20


---

diff --git a/paraview.spec b/paraview.spec
index e27752a..6e0d62d 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -11,6 +11,13 @@
 %{?rcsuf:%global relsuf .%{rcsuf}}
 %{?rcsuf:%global versuf -%{rcsuf}}
 
+# Python2 prefix for building on rhel
+%if 0%{?rhel}
+%global py2_prefix python
+%else
+%global py2_prefix python2
+%endif
+
 # VTK currently is carrying local modifications to gl2ps
 %bcond_with gl2ps
 %if !%{with gl2ps}
@@ -51,7 +58,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        11%{?relsuf}%{?dist}
+Release:        12%{?relsuf}%{?dist}
 Summary:        Parallel visualization application
 
 License:        BSD
@@ -76,13 +83,13 @@ BuildRequires:  cmake(Qt5)
 BuildRequires:  cmake(Qt5UiPlugin)
 BuildRequires:  cmake(Qt5X11Extras)
 BuildRequires:  qt5-qtwebkit-devel
-BuildRequires:  python-qt5
+BuildRequires:  %{py2_prefix}-qt5
 %else
 BuildRequires:  qt-devel
 BuildRequires:  qt-webkit-devel
 %endif
 BuildRequires:  mesa-libOSMesa-devel
-BuildRequires:  python-devel, tk-devel, hdf5-devel
+BuildRequires:  %{py2_prefix}-devel, tk-devel, hdf5-devel
 BuildRequires:  cgnslib-devel
 # Fails looking for PythonQt_QtBindings.h
 # https://gitlab.kitware.com/paraview/paraview/issues/17365
@@ -123,11 +130,12 @@ BuildRequires:  libappstream-glib
 
 Requires:       hdf5%{?_hdf5_version: = %{_hdf5_version}}
 Requires:       %{name}-data = %{version}-%{release}
-Requires:       python-pygments
-Requires:       python-six
-Requires:       python2-autobahn
-Requires:       python2-numpy
-Requires:       python2-twisted
+Requires:       %{py2_prefix}-pygments
+Requires:       %{py2_prefix}-six
+%{?fedora:Requires: python2-numpy}
+%{?rhel:Requires: numpy}
+Requires:       %{py2_prefix}-twisted
+Requires:       %{py2_prefix}-autobahn
 
 Obsoletes:      paraview-demos < 3.2.1-4
 
@@ -288,11 +296,14 @@ Summary:        Documentation files for ParaView
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  hardlink
-BuildRequires:  python2-autobahn
-BuildRequires:  python2-devel
-BuildRequires:  python2-numpy
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-twisted
+BuildRequires:  %{py2_prefix}-devel
+%{?fedora:BuildRequires: python2-numpy}
+%{?rhel:BuildRequires: numpy}
+BuildRequires:  %{py2_prefix}-sphinx
+
+# Unavailable on rhel
+BuildRequires:  %{py2_prefix}-twisted
+BuildRequires:  %{py2_prefix}-autobahn
 
 BuildArch:      noarch
 
@@ -310,11 +321,12 @@ BuildRequires:  netcdf-openmpi-devel
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       mpi4py-openmpi
-Requires:       python-pygments
-Requires:       python-six
-Requires:       python2-autobahn
-Requires:       python2-numpy
-Requires:       python2-twisted
+Requires:       %{py2_prefix}-pygments
+Requires:       %{py2_prefix}-six
+%{?fedora:Requires: python2-numpy}
+%{?rhel:Requires: numpy}
+Requires:       %{py2_prefix}-twisted
+Requires:       %{py2_prefix}-autobahn
 
 Obsoletes:      %{name}-mpi < 3.6.2-5
 
@@ -348,11 +360,12 @@ BuildRequires:  netcdf-mpich-devel
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires:       mpi4py-mpich
-Requires:       python-pygments
-Requires:       python-six
-Requires:       python2-autobahn
-Requires:       python2-numpy
-Requires:       python2-twisted
+Requires:       %{py2_prefix}-pygments
+Requires:       %{py2_prefix}-six
+%{?fedora:Requires: python2-numpy}
+%{?rhel:Requires: numpy}
+Requires:       %{py2_prefix}-twisted
+Requires:       %{py2_prefix}-autobahn
 
 Obsoletes:      %{name}-mpich2 < 3.98.1-6
 
@@ -506,12 +519,13 @@ find %{buildroot}%{_pkgdocdir} -name '.*' -print0 | xargs -0 rm -frv
 find %{buildroot}%{_pkgdocdir} -name '*.map' -or -name '*.md5' -print -delete
 hardlink -cfv %{buildroot}%{_pkgdocdir}
 
-
+%if 0%{?rhel} && 0%{?rhel} <= 7
 %post
 update-desktop-database &> /dev/null ||:
 
 %postun
 update-desktop-database &> /dev/null ||:
+%endif
 
 %pre
 #Handle changing from directory to file
@@ -519,7 +533,7 @@ if [ -d %{_libdir}/paraview/paraview ]; then
   rm -r %{_libdir}/paraview/paraview
 fi
 
-
+%if 0%{?rhel} && 0%{?rhel} <= 7
 %post data
 /bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -532,13 +546,9 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %posttrans data
-update-mime-database \
-%if 0%{?fedora} || 0%{?rhel} >= 8
--n \
-%endif
-%{_datadir}/mime &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
+%endif
 
 %files
 %license Copyright.txt License_v1.2.txt
@@ -604,6 +614,10 @@ update-mime-database \
 
 
 %changelog
+* Mon Feb 19 2018 Antonio Trande <sagitter@fedoraproject.org> - 5.4.1-12
+- Rebuild for hdf5-1.8.20
+- Remove obsolete scriptlets
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.4.1-11
 - Escape macros in %%changelog