From 3519d709bb1a6c0110639c493284f8a609f2ecf8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 08 2017 18:23:23 +0000 Subject: Fix typos, add provides for bundled protobuf --- diff --git a/paraview.spec b/paraview.spec index 5bf6eda..a799a7f 100644 --- a/paraview.spec +++ b/paraview.spec @@ -28,10 +28,10 @@ # https://gitlab.kitware.com/paraview/paraview/issues/17029 %if 0%{?fedora} >= 26 %bcond_with protobuf -%global vtk_use_system_protobuf -DVTKUSE_SYSTEM_PROTOBUF:BOOL=OFF +%global vtk_use_system_protobuf -DVTK_USE_SYSTEM_PROTOBUF:BOOL=OFF %else %bcond_without protobuf -%global vtk_use_system_protobuf -DVTKUSE_SYSTEM_PROTOBUF:BOOL=ON +%global vtk_use_system_protobuf -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON %endif # We need pugixml >= 1.4 @@ -92,7 +92,9 @@ BuildRequires: libpng-devel BuildRequires: libtheora-devel BuildRequires: libxml2-devel BuildRequires: netcdf-cxx-devel +%if %{with protobuf} BuildRequires: protobuf-devel +%endif %if %{system_pugixml} BuildRequires: pugixml-devel >= 1.4 %endif @@ -135,6 +137,10 @@ Provides: bundled(kwsys-systemtools) %if !0%{system_jsoncpp} Provides: bundled(jsoncpp) = 0.7.0 %endif +# Bundled protobuf +%if !%{with protobuf} +Provides: bundled(protobuf) = 2.3.0 +%endif # Bundled vtk # https://bugzilla.redhat.com/show_bug.cgi?id=697842 Provides: bundled(vtk) = 6.3.0 @@ -194,7 +200,7 @@ Provides: bundled(xdmf2) -DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \\\ -DVTK_USE_SYSTEM_NETCDF=ON \\\ - %{?vtk_use_system_probuf} \\\ + %{?vtk_use_system_protobuf} \\\ %{?vtk_use_system_pugixml} \\\ -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON \\\ -DVTK_USE_SYSTEM_QTTESTING=OFF \\\