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: [PATCH] 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/Makefile | 4 ++++ redhat/common/cmake/cmake.spec | 36 ++++++++++++++++------------ redhat/docker/el6/Dockerfile.i686 | 3 ++- redhat/docker/el6/Dockerfile.x86_64 | 1 + redhat/docker/el6/packages | 2 ++ redhat/docker/el6/rpmmacros | 1 + redhat/main/tdewebdev/tdewebdev.spec | 7 ++++++ 7 files changed, 38 insertions(+), 16 deletions(-) diff --git a/redhat/Makefile b/redhat/Makefile index 9a74858fa..2254088e6 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -62,7 +62,9 @@ libcarddav: tqtinterface $(call buildpkg,dependencies/libcarddav) polkit-tqt: tqtinterface dbus-1-tqt +ifeq (,$(filter $(DIST), .el5 .el6 )) $(call buildpkg,dependencies/polkit-tqt) +endif python-tqt: sip4-tqt tdelibs tqscintilla ifeq (,$(filter $(DIST), .oss154 )) @@ -508,7 +510,9 @@ piklab: tdebase $(call buildpkg,applications/piklab) polkit-agent-tde: tdebase +ifeq (,$(filter $(DIST), .el5 .el6 )) $(call buildpkg,applications/polkit-agent-tde) +endif potracegui: tdebase $(call buildpkg,applications/potracegui) 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 diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 5e8c9827d..2ed6aa216 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \ && rm -fv /etc/yum.repos.d/*.repo \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ + && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \ && setarch i686 yum -y clean all \ && setarch i686 yum -y update \ && rm -fv /etc/yum.repos.d/CentOS-*.repo \ @@ -38,7 +39,7 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm +RUN sudo rpm -Uvh http://xh61v/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index cbde1af99..e59ee8957 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -14,6 +14,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ && yum -y clean all \ && yum -y update \ + && rm -fv /etc/yum.repos.d/CentOS-*.repo \ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ && yum -y install $(