4 files changed, 32 insertions, 25 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/