RPM: more updates

17 files changed, 137 insertions, 81 deletions

diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec
index c7219b5b1..e2c7f611a 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/basket/basket.spec
@@ -65,7 +65,7 @@ BuildRequires:	trinity-kontact-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gpgme-devel
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -101,32 +101,35 @@ baskets to HTML.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -134,7 +137,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -181,9 +184,9 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_datadir}/services/basket_part.desktop
 %{tde_datadir}/services/basketthumbcreator.desktop
 %{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
 %{tde_tdedocdir}/HTML/en/basket/
 %config(noreplace) %{tde_confdir}/magic/basket.magic.mgc
+%{tde_mandir}/man1/basket.*
 
 
 %changelog
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec
index 8e478291e..c33a47113 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/bibletime/bibletime.spec
@@ -124,7 +124,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-%if 0%{?fedora} >= 31
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
 CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
 %endif
 
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index 6abcc57df..b255ec536 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -180,8 +180,11 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
 %{tde_bindir}/kgtk-wrapper
 %{tde_bindir}/kgtk2-wrapper
 %{tde_bindir}/kqt3-wrapper
+%dir %{tde_datadir}/kgtk
+%dir %{tde_libdir}/kgtk
 %{tde_libdir}/kgtk/libkgtk2.so
 %{tde_libdir}/kgtk/libkqt3.so
 %{tde_datadir}/kgtk/preload
 
+
 %changelog
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec
index edca31800..27d4ef6b2 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -223,6 +223,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
 %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/
 
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec
index 374081de4..2f57100bb 100644
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ b/redhat/dependencies/python-tqt/python-tqt.spec
@@ -245,6 +245,7 @@ cp -rf ../pyuic3 ../pylupdate3
 
 echo yes | %__python ../configure.py \
 	-c -n %{_includedir}/tqscintilla \
+	-g %{_includedir}/tqt3 \
 	-q %{_datadir}/tqt3 \
 	-y tqt-mt \
 	-o %{_libdir} -u -j 10 \
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index 1ece07861..639f8ef9e 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -57,6 +57,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
@@ -100,15 +101,29 @@ contains the TLS plugin.
 %build
 unset QTDIR QTINC QTLIB
 
-./configure \
-  --tqtdir=%{_prefix}
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
-%__make %{?_smp_mflags}
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+ -DWITH_ALL_OPTIONS="ON" \
+ \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
+%__make install DESTDIR="%{?buildroot}" -C build
 
 
 %clean
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index e4253ac40..682250423 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -234,8 +234,8 @@ fi
 
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index f317effb7..4f5a7acdd 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -20,7 +20,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
  && dnf -y install epel-release \
  && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \
  && dnf -y install dnf-plugins-core \
- && dnf config-manager --enable PowerTools \
+ && dnf config-manager --enable powertools \
  && dnf -y --enableplugin=ovl install $(</packages)
 
 # Add YUM repository for locally built packages
@@ -40,58 +40,19 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/g/gnuchess-6.2.5-8.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pilot-link-0.12.5-41.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pylibacl-0.5.2-11.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-1*.rpm --nodeps
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-10.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/psutils-1.23-15.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-1*.rpm
-
-#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/j/jasper-2.0.14-8.fc30.src.rpm
-#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/jasper-2*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/w/wireless-tools-29-22.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
-
-RUN rpmbuild --rebuild https://li.nux.ro/download/nux/dextop/el7/SRPMS/libgssglue-0.4-2.el7.nux.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libgssglue{,-devel}-0*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libao-1.2.0-14.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libao{,-devel}-1*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
-
 RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-1.016-4.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Dist-0.49-17.fc30.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm
-
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-31.fc32.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-Packer-1.049-5.fc32.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index a9018237e..08e696e2a 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -57,6 +57,7 @@ gtk2-devel
 gtk3-devel
 gtk-doc
 guile-devel
+heimdal-devel
 hspell-devel
 icu
 ImageMagick-devel
@@ -71,6 +72,7 @@ java-openjdk
 kernel
 lame-devel
 libacl-devel
+libao-devel
 libarchive-devel
 libassuan-devel
 libblkid-devel
@@ -85,6 +87,7 @@ libdvdread-devel
 libfontenc-devel
 libgpod-devel
 libgsf-devel
+libgssglue-devel
 libical-devel
 libidn-devel
 libksba-devel
@@ -95,6 +98,7 @@ libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
 libnsl2-devel
+libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
@@ -149,12 +153,14 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
 perl-generators
 perl(ExtUtils::MakeMaker)
 perl(inc::Module::Install)
 perl(IPC::Run3)
+perl(PAR::Dist)
 perl(Module::Signature)
 perl(Test::Pod)
 perl(Test::Pod::Coverage)
@@ -167,11 +173,16 @@ postgresql
 postgresql-devel
 postgresql-server-devel
 ppp
+psutils
 pulseaudio-libs-devel
+pylibacl
 python2
 python2-devel
 python3
 python3-devel
+python3-pyxattr
+rdesktop
+rdiff-backup
 readline-devel
 recode
 redhat-rpm-config
@@ -188,6 +199,7 @@ sqlite-devel
 subversion-devel
 sudo
 swig
+sword-devel
 systemd-devel
 taglib-devel
 tcl
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
index c6a7ce03a..dc2cb7e68 100644
--- a/redhat/docker/el8/rpmmacros
+++ b/redhat/docker/el8/rpmmacros
@@ -1,3 +1,5 @@
 %dist .el8
 %_smp_mflags -j8
 %jobs 8
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages
index 0b34e0334..d0532b160 100644
--- a/redhat/docker/f33/packages
+++ b/redhat/docker/f33/packages
@@ -228,6 +228,7 @@ xmedcon
 xmedcon-devel
 xmlto
 xorg-x11-font-utils
+xorg-x11-server-utils
 xscreensaver
 xscreensaver-extras
 xz-devel
diff --git a/redhat/docker/f33/rpmmacros b/redhat/docker/f33/rpmmacros
index 56410f591..456df0c7b 100644
--- a/redhat/docker/f33/rpmmacros
+++ b/redhat/docker/f33/rpmmacros
@@ -2,3 +2,5 @@
 %_smp_mflags -j8
 %jobs 8
 %__cmake_builddir %nil
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/mga7/rpmmacros b/redhat/docker/mga7/rpmmacros
index 8d3b31456..dc309ee7e 100644
--- a/redhat/docker/mga7/rpmmacros
+++ b/redhat/docker/mga7/rpmmacros
@@ -2,3 +2,5 @@
 %_smp_mflags -j8
 %jobs 8
 %_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index a5036e35f..3ec3dd8cc 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -1491,9 +1491,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_libdir}/libtdeinit_kxkb.la
 %{tde_libdir}/libtdeinit_kxkb.so
 %{tde_libdir}/libkhotkeys_shared.so.*
-%if "%{?tde_version}" == "14.1.0"
 %{tde_tdeappdir}/kdcop.desktop
-%endif
 %{tde_tdeappdir}/keyboard.desktop
 %{tde_tdeappdir}/keyboard_layout.desktop
 %{tde_tdeappdir}/khotkeys.desktop
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index 96842987d..74f9d8e14 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -32,6 +32,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -156,6 +157,7 @@ Requires: trinity-ktron = %{version}-%{release}
 Requires: trinity-ktuberling = %{version}-%{release}
 Requires: trinity-twin4 = %{version}-%{release}
 Requires: trinity-lskat = %{version}-%{release}
+Requires: trinity-tdefifteen = %{version}-%{release}
 
 
 %description
@@ -189,6 +191,7 @@ TDE desktop.
 %defattr(-,root,root,-)
 %{tde_datadir}/cmake/libtdegames.cmake
 %{tde_libdir}/pkgconfig/libtdegames.pc
+%{tde_mandir}/man*/atlantik.*
 
 ##########
 
@@ -325,6 +328,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/kasteroids/
 %{tde_datadir}/config.kcfg/kasteroids.kcfg
 %{tde_tdedocdir}/HTML/en/kasteroids/
+%{tde_mandir}/man*/kasteroids.*
 
 ##########
 
@@ -347,6 +351,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/katomic.desktop
 %{tde_bindir}/katomic
 %{tde_tdedocdir}/HTML/en/katomic/
+%{tde_mandir}/man*/katomic.*
 
 ##########
 
@@ -371,6 +376,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
 %{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
 %{tde_tdedocdir}/HTML/en/kbackgammon/
+%{tde_mandir}/man*/kbackgammon.*
 
 ##########
 
@@ -394,6 +400,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kbattleship.desktop
 %{tde_bindir}/kbattleship
 %{tde_tdedocdir}/HTML/en/kbattleship/
+%{tde_mandir}/man*/kbattleship.*
 
 ##########
 
@@ -418,6 +425,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kblackbox.desktop
 %{tde_bindir}/kblackbox
 %{tde_tdedocdir}/HTML/en/kblackbox/
+%{tde_mandir}/man*/kblackbox.*
 
 ##########
 
@@ -452,6 +460,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kbounce.png
 %{tde_bindir}/kbounce
 %{tde_tdedocdir}/HTML/en/kbounce/
+%{tde_mandir}/man*/kbounce.*
 
 ##########
 
@@ -478,6 +487,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kenolaba.desktop
 %{tde_bindir}/kenolaba
 %{tde_tdedocdir}/HTML/en/kenolaba/
+%{tde_mandir}/man*/kenolaba.*
 
 ##########
 
@@ -501,6 +511,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kfouleggs
 %{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
 %{tde_tdedocdir}/HTML/en/kfouleggs/
+%{tde_mandir}/man*/kfouleggs.*
 
 ##########
 
@@ -533,6 +544,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/KGoldrunner.desktop
 %{tde_bindir}/kgoldrunner
 %{tde_tdedocdir}/HTML/en/kgoldrunner/
+%{tde_mandir}/man*/kgoldrunner.*
 
 ##########
 
@@ -558,6 +570,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kjumpingcube.desktop
 %{tde_datadir}/config.kcfg/kjumpingcube.kcfg
 %{tde_tdedocdir}/HTML/en/kjumpingcube/
+%{tde_mandir}/man*/kjumpingcube.*
 
 ##########
 
@@ -579,6 +592,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
 %{tde_datadir}/apps/klickety/
 %{tde_tdedocdir}/HTML/en/klickety/
+%{tde_mandir}/man*/klickety.*
 
 ##########
 
@@ -609,6 +623,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/klines.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/klines.png
 %{tde_tdedocdir}/HTML/en/klines/
+%{tde_mandir}/man*/klines.*
 
 ##########
 
@@ -631,6 +646,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kmahjongg
 %{tde_datadir}/config.kcfg/kmahjongg.kcfg
 %{tde_tdedocdir}/HTML/en/kmahjongg/
+%{tde_mandir}/man*/kmahjongg.*
 
 ##########
 
@@ -657,6 +673,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/kmines/
 %{tde_bindir}/kmines
 %{tde_tdedocdir}/HTML/en/kmines/
+%{tde_mandir}/man*/kmines.*
 
 ##########
 
@@ -679,6 +696,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
 %{tde_tdeappdir}/knetwalk.desktop
 %{tde_tdedocdir}/HTML/en/knetwalk/
+%{tde_mandir}/man*/knetwalk.*
 
 ##########
 
@@ -709,6 +727,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.so.1.2.0
 %{tde_tdedocdir}/HTML/en/kolf/
 %config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc
+%{tde_mandir}/man*/kolf.*
 
 ##########
 
@@ -749,6 +768,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/konquest.desktop
 %{tde_bindir}/konquest
 %{tde_tdedocdir}/HTML/en/konquest/
+%{tde_mandir}/man*/konquest.*
 
 ##########
 
@@ -769,6 +789,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kpat.desktop
 %{tde_bindir}/kpat
 %{tde_tdedocdir}/HTML/en/kpat/
+%{tde_mandir}/man*/kpat.*
 
 ##########
 
@@ -789,6 +810,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kpoker.desktop
 %{tde_bindir}/kpoker
 %{tde_tdedocdir}/HTML/en/kpoker/
+%{tde_mandir}/man*/kpoker.*
 
 ##########
 
@@ -818,6 +840,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
 %{tde_datadir}/icons/hicolor/*/apps/kreversi.png
 %{tde_tdedocdir}/HTML/en/kreversi/
+%{tde_mandir}/man*/kreversi.*
 
 ##########
 
@@ -840,6 +863,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ksame/
 %{tde_tdeappdir}/ksame.desktop
 %{tde_tdedocdir}/HTML/en/ksame/
+%{tde_mandir}/man*/ksame.*
 
 ##########
 
@@ -863,6 +887,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kshisen.desktop
 %{tde_bindir}/kshisen
 %{tde_tdedocdir}/HTML/en/kshisen/
+%{tde_mandir}/man*/kshisen.*
 
 ##########
 
@@ -890,6 +915,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/ksirtet
 %{tde_datadir}/config.kcfg/ksirtet.kcfg
 %{tde_tdedocdir}/HTML/en/ksirtet/
+%{tde_mandir}/man*/ksirtet.*
 
 ##########
 
@@ -911,6 +937,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/ksmiletris.desktop
 %{tde_bindir}/ksmiletris
 %{tde_tdedocdir}/HTML/en/ksmiletris/
+%{tde_mandir}/man*/ksmiletris.*
 
 ##########
 
@@ -932,6 +959,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/ksnake.desktop
 %{tde_bindir}/ksnake
 %{tde_tdedocdir}/HTML/en/ksnake/
+%{tde_mandir}/man*/ksnake.*
 
 ##########
 
@@ -967,6 +995,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
 %{tde_bindir}/ksokoban
 %{tde_tdedocdir}/HTML/en/ksokoban/
+%{tde_mandir}/man*/ksokoban.*
 
 ##########
 
@@ -992,6 +1021,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kspaceduel
 %{tde_datadir}/config.kcfg/kspaceduel.kcfg
 %{tde_tdedocdir}/HTML/en/kspaceduel/
+%{tde_mandir}/man*/kspaceduel.*
 
 ##########
 
@@ -1013,6 +1043,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ktron/
 %{tde_datadir}/config.kcfg/ktron.kcfg
 %{tde_tdedocdir}/HTML/en/ktron/
+%{tde_mandir}/man*/ktron.*
 
 ##########
 
@@ -1047,6 +1078,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ktuberling/
 %{tde_datadir}/mimelnk/application/x-tuberling.desktop
 %{tde_tdedocdir}/HTML/en/ktuberling/
+%{tde_mandir}/man*/ktuberling.*
 
 ##########
 
@@ -1077,6 +1109,8 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/twin4.png
 %{tde_tdeappdir}/twin4.desktop
 %{tde_tdedocdir}/HTML/en/twin4/
+%{tde_mandir}/man*/twin4.*
+%{tde_mandir}/man*/twin4proc.*
 
 ##########
 
@@ -1104,6 +1138,27 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/lskat.png
 %{tde_tdeappdir}/lskat.desktop
 %{tde_tdedocdir}/HTML/en/lskat/
+%{tde_mandir}/man*/lskat.*
+%{tde_mandir}/man*/lskatproc.*
+
+##########
+
+%package -n trinity-tdefifteen
+Summary:	Puzzle-solving game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-tdefifteen
+TDEFifteen is a sliding puzzle that consists of a frame of numbered square
+tiles in random order with one tile missing.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-tdefifteen
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefifteen
+%{tde_tdeappdir}/tdefifteen.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdefifteen.png
+%{tde_mandir}/man*/tdefifteen.*
 
 ##########
 
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 1385b769a..3a4d5f5f7 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -261,9 +261,9 @@ BuildRequires:	speex-devel
 
 # Build kopete motionaway plugin
 %if 0%{?rhel} == 5
-%define global build_kopete_motionaway 0
+%define build_kopete_motionaway 0
 %else
-%define global build_kopete_motionaway 1
+%define build_kopete_motionaway 1
 %endif
 
 Obsoletes:	trinity-kdenetwork < %{version}-%{release}
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index ad1f97be2..5d2601476 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -355,7 +355,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
 %{tde_datadir}/icons/hicolor/*/apps/irkick.png
 %{tde_datadir}/icons/locolor/*/apps/irkick.png
 %{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcmlirc/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlirc/
 
 ##########