Accepting request 800678 from home:badshah400:branches:science

Fix previous commit

OBS-URL: https://build.opensuse.org/request/show/800678
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=79

paraview.spec

@@ -29,12 +29,6 @@
 # Need patched version with HPDF_SHADING
 %bcond_with    haru
 
-%if 0%{?suse_version} == 1500 && 0%{?sle_version} <= 150100
-%bcond_with    protobuf
-%else
-%bcond_without protobuf
-%endif
-
 %define __builder ninja
 
 Name:           paraview
@@ -67,7 +61,7 @@ Patch11:        0001-Add-libogg-to-IOMovie-target-link-libraries.patch
 Patch13:        fix-loguru-missing-links.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  cgns-devel
-BuildRequires:  cmake >= 3.3
+BuildRequires:  cmake >= 3.13
 BuildRequires:  desktop-file-utils
 BuildRequires:  double-conversion-devel
 BuildRequires:  doxygen
@@ -118,9 +112,7 @@ BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(netcdf)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(openssl)
-%if %{with protobuf}
 BuildRequires:  pkgconfig(protobuf) >= 2.6.0
-%endif
 %if %{with pugixml}
 BuildRequires:  pkgconfig(pugixml)
 %endif
@@ -221,9 +213,7 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe
        -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \
        -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
-       -DVTK_MODULE_ENABLE_ParaView_protobuf=%{?with_protobuf:YES}%{!?with_protobuf:NO} \
-       -DVTK_MODULE_ENABLE_ParaView_RemotingServerManager=%{?with_protobuf:YES}%{!?with_protobuf:NO} 
+       -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF}
 
 %cmake_build