RPM: update build scripts for rhel6 to use cmake3

Signed-off-by: François Andriot <albator78@libertysurf.fr>

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 $(</packages)
 
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 7f9db04e2..9c05dc013 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -9,6 +9,7 @@ binutils-devel
 bison
 boost-devel
 bzip2-devel
+byacc
 ccache
 ccrtp-devel
 cdparanoia
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 commoncpp2-devel
 cpp
 cppunit-devel
diff --git a/redhat/docker/el6/rpmmacros b/redhat/docker/el6/rpmmacros
index 3b33ecbc0..74a547ddb 100644
--- a/redhat/docker/el6/rpmmacros
+++ b/redhat/docker/el6/rpmmacros
@@ -3,3 +3,4 @@
 %_smp_mflags -j8
 %jobs 8
 %_topdir /home/trinity/rpmbuild
+%cmake %cmake3
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec
index b42dbcefc..d6b7378da 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/main/tdewebdev/tdewebdev.spec
@@ -484,6 +484,13 @@ fi
   \
   ..
 
+# Strange cmake behaviour under rhel6
+%if 0%{?rhel} == 6
+grep -rl "CXX_FLAGS.*\"-O2" | while read file; do
+  sed -i "${file}" -e "s|\"||g"
+done
+%endif
+
 %__make %{?_smp_mflags} || %__make