From 39aa474cf470a180a73ba313340b4c45d608930c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 15 May 2022 09:16:54 +0200 Subject: RPM: update build scripts for rhel6 to use cmake3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/common/cmake/cmake.spec | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'redhat/common/cmake') diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec index fc4e0ca42..cd6825db3 100644 --- a/redhat/common/cmake/cmake.spec +++ b/redhat/common/cmake/cmake.spec @@ -17,10 +17,16 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.11 +%define tde_version 14.1.0 %endif %define tde_pkg cmake +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%define cmake_datadir %{_datadir}/cmake3 +%else +%define cmake_datadir %{_datadir}/cmake +%endif + Name: trinity-%{tde_pkg} Version: %{tde_version} @@ -93,20 +99,20 @@ fi %files %defattr(-,root,root,-) -%{_datadir}/cmake/Modules/FindTDE.cmake -%{_datadir}/cmake/Modules/FindTQt.cmake -%{_datadir}/cmake/Modules/FindTQtQUI.cmake -%{_datadir}/cmake/Modules/TDEL10n.cmake -%{_datadir}/cmake/Modules/TDEMacros.cmake -%{_datadir}/cmake/Modules/TDESetupPaths.cmake -%{_datadir}/cmake/Modules/tde_automoc.cmake -%{_datadir}/cmake/Modules/tde_l10n_merge.pl -%{_datadir}/cmake/Modules/tde_uic.cmake -%{_datadir}/cmake/Templates/tde_dummy_cpp.cmake -%{_datadir}/cmake/Templates/tde_export_library.cmake -%{_datadir}/cmake/Templates/tde_libtool_file.cmake -%{_datadir}/cmake/Templates/tde_tdeinit_executable.cmake -%{_datadir}/cmake/Templates/tde_tdeinit_module.cmake +%{cmake_datadir}/Modules/FindTDE.cmake +%{cmake_datadir}/Modules/FindTQt.cmake +%{cmake_datadir}/Modules/FindTQtQUI.cmake +%{cmake_datadir}/Modules/TDEL10n.cmake +%{cmake_datadir}/Modules/TDEMacros.cmake +%{cmake_datadir}/Modules/TDESetupPaths.cmake +%{cmake_datadir}/Modules/tde_automoc.cmake +%{cmake_datadir}/Modules/tde_l10n_merge.pl +%{cmake_datadir}/Modules/tde_uic.cmake +%{cmake_datadir}/Templates/tde_dummy_cpp.cmake +%{cmake_datadir}/Templates/tde_export_library.cmake +%{cmake_datadir}/Templates/tde_libtool_file.cmake +%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake +%{cmake_datadir}/Templates/tde_tdeinit_module.cmake %changelog -- cgit v1.2.3