6 files changed, 33 insertions, 11 deletions
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 174391037..31e63ef48 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_prefix /opt/trinity
 
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 2470b3412..a03d6bd5f 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -67,7 +67,7 @@ This utility was originally written for openSUSE KDE3.
 
 %prep
 %setup -q -n fileshareset2
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "." || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "." || %__cp -f "/usr/share/libtool/ltmain.sh" "."
 aclocal
 autoconf
 automake -a -c
@@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
 
 # Rename binary to avoid conflict with kde3
 mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
-ln -sf "fileshareset2"  "%{?buildroot}%{_bindir}/filesharelist"
+ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
 
 
 %clean
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index dab280946..f1a779fc9 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -1,6 +1,12 @@
 %define _disable_ld_as_needed 1
 %define _disable_ld_no_undefined 1
 
+%if 0%{?mdkver} >= 5000000
+%global __cc /usr/bin/gcc
+%global __cxx /usr/bin/g++
+%global prefer_gcc 1
+%endif
+
 %define contentdir /var/www
 
 Summary:	A web indexing and searching system for a small domain or intranet
@@ -26,6 +32,9 @@ BuildRequires:	zlib-devel
 
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 
+Provides: group(htdig)
+Provides: user(htdig)
+
 %description
 The ht://Dig system is a complete world wide web indexing and searching system 
 for a small domain or intranet. This system is not meant to replace the need 
@@ -105,10 +114,10 @@ Libraries needed to develop for htdig.
 %defattr(-,root,root)
 %doc ChangeLog
 %doc htdoc/*
-%{_libdir}/htdig/*.a
+#%{_libdir}/htdig/*.a
 %{_libdir}/htdig/*.la
 %{_libdir}/htdig/*[a-z].so
-%{_libdir}/htdig_db/*.a
+#%{_libdir}/htdig_db/*.a
 %{_libdir}/htdig_db/*.la
 %{_libdir}/htdig_db/*[a-z].so
 %{_includedir}/*
@@ -204,6 +213,10 @@ autoreconf -fiv
     --with-apache=/usr/sbin/httpd \
     --with-zlib=%{_prefix}
 
+%if 0%{?fedora} == 40
+echo "#define HAVE_SHMGET 1" >>"db/db_config.h"
+%endif
+
 %__make %{?_smp_mflags}
 mv htdoc/ChangeLog .
 
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
index 8c26664fe..35f83a72e 100644
--- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -17,7 +17,7 @@
 
 
 Name:		pinentry-tqt
-Version:	1.1.1
+Version:	1.3.0
 Release:	1%{?dist}
 Summary:	PIN or passphrase entry dialogs
 Group:		System/Libraries
@@ -45,7 +45,13 @@ BuildRequires:	autoconf automake libtool m4
 BuildRequires:	pkgconfig
 
 BuildRequires:	libassuan-devel
+
+# SECRET support
+%if 0%{?mdkver} >= 5000000
+BuildRequires:	%{_lib}secret-devel
+%else
 BuildRequires:	libsecret-devel
+%endif
 
 Requires:		pinentry
 
@@ -92,6 +98,7 @@ fi
   --disable-pinentry-gnome3 \
   --disable-pinentry-gtk2 \
   --disable-pinentry-qt \
+  --disable-pinentry-qt4 \
   --disable-pinentry-qt5 \
   --disable-pinentry-tty
 
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index e05691fba..a73b9c7ee 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -16,7 +16,7 @@
 #
 
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -159,17 +159,18 @@ Requires: trinity-knowit
 Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
+Requires: trinity-kommando
 Requires: trinity-kompose
 Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599
+%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 && 0%{?suse_version} != 1699
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
 Requires: trinity-kpilot
 %endif
 %endif
-#Requires: trinity-kplayer
+Requires: trinity-kplayer
 Requires: trinity-krecipes
 Requires: trinity-krename
 Requires: trinity-krusader
@@ -211,6 +212,7 @@ Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
+Requires: trinity-tde-style-polyester
 Requires: trinity-tde-systemsettings
 Requires: trinity-tdedocker
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
@@ -236,6 +238,7 @@ Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
 Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-fahrenheit
 Requires: trinity-twin-style-machbunt
 Requires: trinity-twin-style-suse2
 Requires: trinity-wlassistant
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 60ef22ddc..e6fccabdb 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -65,7 +65,6 @@ This package installs the Trinity directory structure.
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
-%dir %{tde_confdir}
 %dir %{tde_confdir}/magic
 
 %dir %{tde_docdir}