diff --git a/paraview.spec b/paraview.spec index 0331cf0..1d9499e 100644 --- a/paraview.spec +++ b/paraview.spec @@ -27,9 +27,10 @@ %global vtk_use_system_pugixml -DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF %endif + Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 0.4%{?rcver:.%rcver}%{?dist} +Release: 0.5%{?rcver:.%rcver}%{?dist} Summary: Parallel visualization application License: BSD @@ -50,32 +51,18 @@ Patch2: https://gitlab.kitware.com/paraview/paraview/merge_requests/1123 %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: cmake3 +BuildRequires: qt-assistant %else BuildRequires: cmake -%endif -%if %{build_openmpi} -BuildRequires: openmpi-devel -BuildRequires: mpi4py-openmpi -BuildRequires: netcdf-openmpi-devel -%endif -%if %{build_mpich} -BuildRequires: mpich-devel -BuildRequires: mpi4py-mpich -BuildRequires: netcdf-mpich-devel +BuildRequires: qt-assistant-adp-devel %endif BuildRequires: lz4-devel BuildRequires: qt-devel -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: qt-assistant -%else -BuildRequires: qt-assistant-adp-devel -%endif BuildRequires: qt-webkit-devel BuildRequires: mesa-libOSMesa-devel BuildRequires: python-devel, tk-devel, hdf5-devel BuildRequires: freetype-devel, libtiff-devel, zlib-devel BuildRequires: expat-devel -BuildRequires: doxygen, graphviz BuildRequires: readline-devel BuildRequires: openssl-devel BuildRequires: gnuplot @@ -101,15 +88,17 @@ BuildRequires: desktop-file-utils %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: libappstream-glib %endif + Requires: hdf5 = %{_hdf5_version} Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-doc = %{version}-%{release} Requires: python-pygments Requires: python-six -Obsoletes: paraview-demos < %{version}-%{release} +Requires: python2-numpy +Requires: python2-twisted + +Obsoletes: paraview-demos < 3.2.1-4 + Provides: paraview-demos = %{version}-%{release} -Obsoletes: paraview-doc < %{version}-%{release} -Provides: paraview-doc = %{version}-%{release} # Bundled KWSys # https://fedorahosted.org/fpc/ticket/555 @@ -141,6 +130,9 @@ Provides: bundled(libproj4) Provides: bundled(qttesting) Provides: bundled(xdmf2) +# Setup _pkgdocdir if not defined already. +%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} + # Do not provide anything in paraview's library directory %global __provides_exclude_from ^(%{_libdir}/paraview/|%{_libdir}/.*/lib/paraview/).*$ # Do not require anything provided in paraview's library directory @@ -161,36 +153,23 @@ Provides: bundled(xdmf2) -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DEigen_DIR:FILEPATH=%{_includedir}/eigen3 \\\ -DTCL_LIBRARY:PATH=tcl \\\ - -DTK_LIBRARY:PATH=tk \\\ -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON \\\ -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON \\\ -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\ - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\ - -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\ + -DPARAVIEW_WWW_DIR=%{buildroot}%{_pkgdocdir} \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ -DVTK_INSTALL_DATA_DIR=share/paraview \\\ -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \\\ - -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \\\ - -DVTK_USE_BOOST:BOOL=ON \\\ - -DVTK_USE_INFOVIS:BOOL=OFF \\\ - -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \\\ - -DVTK_USE_SYSTEM_DIY2=OFF \\\ - -DVTK_USE_SYSTEM_ICET=OFF \\\ -DVTK_USE_SYSTEM_LIBRARIES=ON \\\ -DVTK_USE_SYSTEM_HDF5=ON \\\ -DVTK_USE_SYSTEM_AUTOBAHN:BOOL=ON \\\ %{?vtk_use_system_jsoncpp} \\\ - -DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\ - -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \\\ -DVTK_USE_SYSTEM_NETCDF=ON \\\ -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON \\\ %{?vtk_use_system_pugixml} \\\ -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON \\\ -DVTK_USE_SYSTEM_QTTESTING=OFF \\\ - -DVTK_USE_SYSTEM_SIX.PY:BOOL=ON \\\ -DVTK_USE_SYSTEM_TWISTED:BOOL=ON \\\ -DVTK_USE_SYSTEM_XDMF2=OFF \\\ -DVTK_USE_SYSTEM_ZOPE:BOOL=ON \\\ @@ -249,7 +228,13 @@ developing applications that use %{name}. %package doc Summary: Documentation files for ParaView -Requires: %{name} = %{version}-%{release} +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: hardlink +BuildRequires: python2-devel +BuildRequires: python2-numpy +BuildRequires: python2-sphinx +BuildRequires: python2-twisted BuildArch: noarch @@ -261,11 +246,18 @@ BuildArch: noarch %package openmpi Summary: Parallel visualization application +BuildRequires: openmpi-devel +BuildRequires: mpi4py-openmpi +BuildRequires: netcdf-openmpi-devel + Requires: %{name}-data = %{version}-%{release} +Requires: mpi4py-openmpi Requires: python-pygments Requires: python-six +Requires: python2-numpy +Requires: python2-twisted -Obsoletes: %{name}-mpi < %{version}-%{release} +Obsoletes: %{name}-mpi < 3.6.2-5 Provides: %{name}-mpi = %{version}-%{release} @@ -291,14 +283,21 @@ developing applications that use %{name}-openmpi. %package mpich Summary: Parallel visualization application +BuildRequires: mpich-devel +BuildRequires: mpi4py-mpich +BuildRequires: netcdf-mpich-devel + Requires: %{name}-data = %{version}-%{release} +Requires: mpi4py-mpich Requires: python-pygments Requires: python-six - -Provides: %{name}-mpich2 = %{version}-%{release} +Requires: python2-numpy +Requires: python2-twisted Obsoletes: %{name}-mpich2 < 3.98.1-6 +Provides: %{name}-mpich2 = %{version}-%{release} + %description mpich This package contains copies of the ParaView server binaries compiled with mpich. These are named pvserver_mpich, pvbatch_mpich, etc. @@ -311,10 +310,10 @@ Summary: Development files for %{name}-mpich Requires: %{name}-mpich%{?_isa} = %{version}-%{release} -Provides: %{name}-mpich2-devel = %{version}-%{release} - Obsoletes: %{name}-mpich2-devel < 3.98.1-6 +Provides: %{name}-mpich2-devel = %{version}-%{release} + %description mpich-devel The %{name}-mpich-devel package contains libraries and header files for developing applications that use %{name}-mpich. @@ -457,19 +456,30 @@ rm %{buildroot}%{_bindir}/vtk{EncodeString,HashSource,LegacyColorMapXMLToJSON,Pa # Strip build dir from VTKConfig.cmake (bug #917425) find %{buildroot} -name VTKConfig.cmake | xargs sed -i -e '/builddir/s/^/#/' +# Build autodocs and move documentation-files to proper location +mkdir -p %{buildroot}%{_pkgdocdir} +export LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{_libdir}" +export PYTHONPATH="%{buildroot}%{_libdir}/%{name}/site-packages:${PYTHONPATH}" +export PYTHONPATH="${PYTHONPATH%:}:%{python2_sitearch}/mpich" +%make_build ParaViewDoc -C %{_target_platform} +unset LD_LIBRARY_PATH +unset PYTHONPATH +install -pm 0644 README.md %{buildroot}%{_pkgdocdir} +mv %{buildroot}%{_docdir}/paraview-%{pv_majmin}/* %{buildroot}%{_pkgdocdir} +rm -rf %{buildroot}%{_docdir}/paraview-%{pv_majmin} +find %{buildroot}%{_pkgdocdir} -name '.*' -print0 | xargs -0 rm -frv +hardlink -cfv %{buildroot}%{_pkgdocdir} + %post update-desktop-database &> /dev/null ||: - %postun update-desktop-database &> /dev/null ||: - -#Handle changing from directory to file %pre -if [ -d %{_libdir}/paraview/paraview ] -then +#Handle changing from directory to file +if [ -d %{_libdir}/paraview/paraview ]; then rm -r %{_libdir}/paraview/paraview fi @@ -496,7 +506,8 @@ update-mime-database \ %files %license Copyright.txt License_v1.2.txt -%doc README.md +%doc %dir %{_pkgdocdir} +%doc %{_pkgdocdir}/README.md %{_bindir}/paraview %{_bindir}/pvbatch # Currently disabled upstream @@ -520,13 +531,17 @@ update-mime-database \ %{_bindir}/vtkkwProcessXML %{_includedir}/paraview/ %{_datadir}/cmake/ -%{_datadir}/doc/paraview-%{pv_majmin}/ + +%files doc +%license %{_datadir}/license/%{name}* +%doc %{_pkgdocdir} %if %{build_openmpi} %files openmpi -%license Copyright.txt License_v1.2.txt -%doc README.md +%license %{_datadir}/license/%{name}* +%doc %dir %{_pkgdocdir} +%doc %{_pkgdocdir}/README.md %{_libdir}/openmpi/bin/[ps]* %{_libdir}/openmpi/lib/paraview/ @@ -539,8 +554,9 @@ update-mime-database \ %if %{build_mpich} %files mpich -%license Copyright.txt License_v1.2.txt -%doc README.md +%license %{_datadir}/license/%{name}* +%doc %dir %{_pkgdocdir} +%doc %{_pkgdocdir}/README.md %{_libdir}/mpich/bin/[ps]* %{_libdir}/mpich/lib/paraview/ @@ -552,6 +568,14 @@ update-mime-database \ %changelog +* Wed Oct 19 2016 Björn Esser - 5.2.0-0.5.RC2 +- Add needed Requires +- Reintroduce doc-subpkg +- Use unified %%{_pkgdocdir} and unified %%license +- Build documentation +- Proper Obsoletes versioning +- Spec-file improvements + * Wed Oct 19 2016 Björn Esser - 5.2.0-0.4.RC2 - Drop obsolete stuff - Use up-to-date macros