RPM packaging: update build scripts

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 7c49010..d377ab7 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -269,7 +269,7 @@
 
 torsocks:
 # Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia
-ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat /etc/SuSE-release),)
+ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /etc/fedora-release /boot/mageia.dat /etc/SuSE-release),)
 	$(call buildpkg,3rdparty/torsocks)
 endif
 
@@ -329,7 +329,7 @@
 amarok:	tdebase cmake mp4v2
 	$(call buildpkg,applications/amarok)
 
-basket:	tdebase
+basket:	tdebase tdepim
 	$(call buildpkg,applications/basket)
 
 bibletime:	tdebase
@@ -540,7 +540,7 @@
 kooldock:	tdebase
 	$(call buildpkg,applications/kooldock)
 
-kopete-otr:	tdebase
+kopete-otr:	tdebase tdenetwork
 	$(call buildpkg,applications/kopete-otr)
 
 kpicosim:	tdebase
@@ -564,7 +564,7 @@
 krename:	tdebase
 	$(call buildpkg,applications/krename)
 
-krusader:	tdebase
+krusader:	tdebase tdebindings
 	$(call buildpkg,applications/krusader)
 
 kscope:	tdebase cscope
@@ -711,7 +711,7 @@
 tdmtheme:	tdebase
 	$(call buildpkg,applications/tdmtheme)
 
-tellico:	tdebase
+tellico:	tdebase tdemultimedia
 # Do NOT build on CentOS 5
 ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/tellico)
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index e6d2a7d..a0a3c59 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -193,28 +193,26 @@
 
 # Installs supplementary headers
 for i in include/*.h; do
-	%__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
+  %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
 done
 
 # Installs the HTML documentation correctly
 for i in doc/html/*; do
-	%__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/}
+  %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/}
 done
 
 # Installs the Designer plugin
 for i in designer/*.so; do
-	%__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
+  %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} || %__install -D -m 644 ${QTDIR}/plugins/$i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
 done
 
 # Installs libraries
 %__mkdir_p %{buildroot}%{_libdir}
 %__mv -f tmplib/* %{buildroot}%{_libdir}
 
-
 # Fix private headers location
 %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
-
 
 # Fix permissions
 chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 9c5653d..a48b281 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -10,4 +10,4 @@
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
 
 docker rmi -f "${IMAGE}"
-docker build -t "${IMAGE}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
+docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
diff --git a/redhat/docker/el7/Dockerfile b/redhat/docker/el7/Dockerfile
deleted file mode 100644
index 8e11e1c..0000000
--- a/redhat/docker/el7/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-ARG TDE_VERSION=14.0.4
-ARG ARCH=x86_64
-
-# Add EPEL repository
-RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-9.noarch.rpm
-
-# Add NUX repository
-RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
-
-# Install Trinity build dependencies
-ADD packages /etc/yum.repos.d/packages
-RUN yum update -y
-RUN yum install -y $(</etc/yum.repos.d/packages)
-
-# Add YUM repository for locally built packages
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
-
-# Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
-
-# Distro-specific patches
-RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
new file mode 100644
index 0000000..b52a5a7
--- /dev/null
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -0,0 +1,27 @@
+FROM centos:7
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+# Add EPEL repository
+RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-10.noarch.rpm
+
+# Add NUX repository
+RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
+
+# Install Trinity build dependencies
+ADD packages /etc/yum.repos.d/packages
+RUN yum update -y
+RUN yum install -y $(</etc/yum.repos.d/packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+ADD rpmmacros /home/trinity/.rpmmacros
+
+# Distro-specific patches
+RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
diff --git a/redhat/docker/f25/Dockerfile b/redhat/docker/f25/Dockerfile
deleted file mode 100644
index c5338a7..0000000
--- a/redhat/docker/f25/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM fedora:25
-
-ARG TDE_VERSION=14.0.4
-ARG ARCH=x86_64
-
-# Add RPMFUSION repository
-RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-25.noarch.rpm
-
-# Install Trinity build dependencies
-ADD packages /etc/yum.repos.d/packages
-RUN dnf update -y
-RUN dnf install -y $(</etc/yum.repos.d/packages)
-
-# Add YUM repository for locally built packages
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
-
-# Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
new file mode 100644
index 0000000..c5338a7
--- /dev/null
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -0,0 +1,21 @@
+FROM fedora:25
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+# Add RPMFUSION repository
+RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-25.noarch.rpm
+
+# Install Trinity build dependencies
+ADD packages /etc/yum.repos.d/packages
+RUN dnf update -y
+RUN dnf install -y $(</etc/yum.repos.d/packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f26/Dockerfile b/redhat/docker/f26/Dockerfile
deleted file mode 100644
index 3899d12..0000000
--- a/redhat/docker/f26/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM fedora:26
-
-ARG TDE_VERSION=14.0.4
-ARG ARCH=x86_64
-
-# Add RPMFUSION repository
-RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-26.noarch.rpm
-
-# Install Trinity build dependencies
-ADD packages /etc/yum.repos.d/packages
-RUN dnf update -y
-RUN dnf install -y $(</etc/yum.repos.d/packages)
-
-# Add YUM repository for locally built packages
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
-
-# Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
new file mode 100644
index 0000000..ea78581
--- /dev/null
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -0,0 +1,21 @@
+FROM fedora32:26
+
 ** Diff limit reached (max: 250 lines) **