Attachment 10658 Details for Bug 24162 – SPEC patch

[patch] SPEC patch

paraview.spec.patch (text/plain), 3.44 KB, created by Adrien Guichard on 2019-01-13 02:51:56 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Adrien Guichard

Created: 2019-01-13 02:51:56 CET

Size: 3.44 KB

patch

obsolete

>Index: SPECS/paraview.spec
>===================================================================
>--- SPECS/paraview.spec	(revision 1355813)
>+++ SPECS/paraview.spec	(working copy)
>@@ -1,6 +1,5 @@
> # default to enable (and build only) mpi
> %bcond_without                  mpi
>-
> #reminder: pay attention to NOT compile openmpi with
> #--enable-rpath-wrappers, otherwise paraview-mpi binaries end up
> #having a RUNPATH taking precedence over /etc/ld.conf.d/ settings
>@@ -14,32 +13,36 @@
> %define qt_designer_plugins_dir %{_qt5_plugindir}/designer
> %define python_include_path     %{_includedir}/python%{python3_version}m
> %define python_library          %{_libdir}/libpython%{python3_version}m.so
>+# some sources will need more than 4GB of memory to built (vtkExtractVOI.cxx)
>+%define _smp_ncpus_max          $(expr $(nproc) / 2)
> 
> Name:           paraview
>-Version:        5.5.2
>-Release:        %mkrel 5
>+Version:        5.6.0
>+Release:        %mkrel 1
> Summary:        Parallel visualization application
> Group:          Sciences/Other
> License:        BSD
>-URL:            http://www.paraview.org/
>-Source0:        http://www.paraview.org/files/v%{baseversion}/ParaView-v%{version}.tar.xz
>+URL:            https://www.paraview.org/
>+Source0:        https://www.paraview.org/files/v%{baseversion}/ParaView-v%{version}.tar.xz
> Source1:        paraview.xml
> Source2:        paraview.desktop
> #remove source files corresponding to system libraries to force errors
> #if they were silently built
> Source3:        cleansources.bash
>-Source4:        ParaViewData-v%{version}.tar.xz
>+Source4:        https://www.paraview.org/files/v%{baseversion}/ParaViewData-v%{version}.tar.xz
> 
>-Patch0:         paraview-5.5.2-vtkm.patch
>+#Patch0:         paraview-5.5.2-vtkm.patch
> #Patch1:         paraview-5.4.1-fix-build-against-qt-5.11.0.patch
>-Patch1:         paraview-5.5.2-qtheaders.patch
>+#Patch1:         paraview-5.5.2-qtheaders.patch
> #from https://aur.archlinux.org/cgit/aur.git/tree/vtk-fix-jsoncpp-module.patch
>-Patch2:         paraview-5.5.2-vtkjsoncpp.patch
>-Patch3:         paraview-5.5.2-pythonbuild.patch
>+#Patch2:         paraview-5.5.2-vtkjsoncpp.patch
>+#Patch3:         paraview-5.5.2-pythonbuild.patch
> #Remove missing doc dir referenced in CMakeList
>-Patch4:         paraview-5.5.2-streamlines-nodoc.patch
>+#Patch4:         paraview-5.5.2-streamlines-nodoc.patch
> # Fix build with python 3.7
> Patch5:         ParaView-v5.5.2-PyUnicode_AsUTF8-const-char.patch
>+Patch6:         paraview-5.5.2-surfacelic-nodoc.patch
>+Patch7:         ParaView-v5.6.0-MOOSETools-nodoc.patch
> 
> %if %{with mpi}
> BuildRequires:  openmpi-devel
>@@ -90,6 +93,7 @@
> #(eatdirt) broken in spite of patching
> #BuildRequires:  libharu-devel
> BuildRequires:  pkgconfig(glew)
>+BuildRequires:  double-conversion-devel
> 
> Requires:       python3dist(pygobject)
> Requires:       python3dist(pygments)
>@@ -240,7 +244,8 @@
>         -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF                                 \
>         -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON                               \
>         -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON                                 \
>-        -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF
>+        -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF								\
>+        -DVTK_USE_SYSTEM_PEGTL:BOOL=OFF
> 
> %make_build
> 
>@@ -287,7 +292,7 @@
> %{_bindir}/smTestDriver
> %{_bindir}/vtk*
> %{_bindir}/paraview-config
>-%{_datadir}/vtkm-1.1/*
>+%{_datadir}/vtkm-1.2/*
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/mime/packages/%{name}.xml
> %{_datadir}/appdata/paraview.appdata.xml

Index: SPECS/paraview.spec
===================================================================
--- SPECS/paraview.spec	(revision 1355813)
+++ SPECS/paraview.spec	(working copy)
@@ -1,6 +1,5 @@
 # default to enable (and build only) mpi
 %bcond_without                  mpi
-
 #reminder: pay attention to NOT compile openmpi with
 #--enable-rpath-wrappers, otherwise paraview-mpi binaries end up
 #having a RUNPATH taking precedence over /etc/ld.conf.d/ settings
@@ -14,32 +13,36 @@
 %define qt_designer_plugins_dir %{_qt5_plugindir}/designer
 %define python_include_path     %{_includedir}/python%{python3_version}m
 %define python_library          %{_libdir}/libpython%{python3_version}m.so
+# some sources will need more than 4GB of memory to built (vtkExtractVOI.cxx)
+%define _smp_ncpus_max          $(expr $(nproc) / 2)
 
 Name:           paraview
-Version:        5.5.2
-Release:        %mkrel 5
+Version:        5.6.0
+Release:        %mkrel 1
 Summary:        Parallel visualization application
 Group:          Sciences/Other
 License:        BSD
-URL:            http://www.paraview.org/
-Source0:        http://www.paraview.org/files/v%{baseversion}/ParaView-v%{version}.tar.xz
+URL:            https://www.paraview.org/
+Source0:        https://www.paraview.org/files/v%{baseversion}/ParaView-v%{version}.tar.xz
 Source1:        paraview.xml
 Source2:        paraview.desktop
 #remove source files corresponding to system libraries to force errors
 #if they were silently built
 Source3:        cleansources.bash
-Source4:        ParaViewData-v%{version}.tar.xz
+Source4:        https://www.paraview.org/files/v%{baseversion}/ParaViewData-v%{version}.tar.xz
 
-Patch0:         paraview-5.5.2-vtkm.patch
+#Patch0:         paraview-5.5.2-vtkm.patch
 #Patch1:         paraview-5.4.1-fix-build-against-qt-5.11.0.patch
-Patch1:         paraview-5.5.2-qtheaders.patch
+#Patch1:         paraview-5.5.2-qtheaders.patch
 #from https://aur.archlinux.org/cgit/aur.git/tree/vtk-fix-jsoncpp-module.patch
-Patch2:         paraview-5.5.2-vtkjsoncpp.patch
-Patch3:         paraview-5.5.2-pythonbuild.patch
+#Patch2:         paraview-5.5.2-vtkjsoncpp.patch
+#Patch3:         paraview-5.5.2-pythonbuild.patch
 #Remove missing doc dir referenced in CMakeList
-Patch4:         paraview-5.5.2-streamlines-nodoc.patch
+#Patch4:         paraview-5.5.2-streamlines-nodoc.patch
 # Fix build with python 3.7
 Patch5:         ParaView-v5.5.2-PyUnicode_AsUTF8-const-char.patch
+Patch6:         paraview-5.5.2-surfacelic-nodoc.patch
+Patch7:         ParaView-v5.6.0-MOOSETools-nodoc.patch
 
 %if %{with mpi}
 BuildRequires:  openmpi-devel
@@ -90,6 +93,7 @@
 #(eatdirt) broken in spite of patching
 #BuildRequires:  libharu-devel
 BuildRequires:  pkgconfig(glew)
+BuildRequires:  double-conversion-devel
 
 Requires:       python3dist(pygobject)
 Requires:       python3dist(pygments)
@@ -240,7 +244,8 @@
         -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF                                 \
         -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON                               \
         -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON                                 \
-        -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF
+        -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF								\
+        -DVTK_USE_SYSTEM_PEGTL:BOOL=OFF
 
 %make_build
 
@@ -287,7 +292,7 @@
 %{_bindir}/smTestDriver
 %{_bindir}/vtk*
 %{_bindir}/paraview-config
-%{_datadir}/vtkm-1.1/*
+%{_datadir}/vtkm-1.2/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/appdata/paraview.appdata.xml

Actions: View | Diff

Attachments on bug 24162: 10658 | 10659 | 10660