10 files changed, 25 insertions, 13 deletions
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index 24d94f6f2..52528e891 100644
--- a/redhat/core/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -75,7 +75,7 @@ BuildRequires:	gettext
 BuildRequires:	libidn-devel
 
 # ESOUND support
-BuildRequires:	esound-devel
+#BuildRequires:	esound-devel
 
 # ACL support
 BuildRequires:	libacl-devel
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39
+\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39
+\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc40 b/redhat/core/tdebase/pamd.kdm-trinity.fc40
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39
+\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39
+\ No newline at end of file
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index a427e2eb7..60c5a7a12 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -266,10 +266,10 @@ BuildRequires:	libusb-devel
 %endif
 
 # ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
+#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+#define with_esound 1
+#BuildRequires:	esound-devel
+#endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -442,6 +442,9 @@ BuildRequires:	xorg-x11-libxkbfile-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
 BuildRequires:	libxkbfile-devel
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:	xkeyboard-config-devel
+%endif
 %endif
 
 # XDMCP support
diff --git a/redhat/core/tdebase/tdm.fc40.te b/redhat/core/tdebase/tdm.fc40.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc40.te
@@ -0,0 +1 @@
+tdm.fc39.te
+\ No newline at end of file
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 27fb4156b..5ab3d977b 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -1139,14 +1139,8 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
 EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
 %endif
 
-if [ -d "/usr/include/python3.6m" ]; then
-  EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}"
-fi
-
-# Fedora >= 39 comes with python 3.12, but we want version 3.11
-%if 0%{?fedora} >= 39
-export PYTHON=%{__python3}
-%endif
+# Force python version
+export PYTHON=%{__python}
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
 %configure \
@@ -1176,6 +1170,11 @@ export PYTHON=%{__python3}
   %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
   %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
 
+# Ensure python was detected properly
+if grep "LIBPYTHON=''" "config.log"; then
+  exit 1
+fi
+
 # Build dcopperl with specific options
 pushd dcopperl
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 432e2d0bd..abc95e468 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -126,6 +126,10 @@ BuildRequires:	libcdda-devel
 BuildRequires:	cdparanoia-devel
 %endif
 
+# CDIO support
+BuildRequires:	libcdio-devel
+BuildRequires:	libcdio-paranoia-devel
+
 # FLAC support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index 0e4463018..f53b0d0f0 100644
--- a/redhat/core/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -1062,6 +1062,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try
 %{tde_datadir}/apps/zeroconf/_nfs._tcp
 %{tde_datadir}/apps/zeroconf/_ssh._tcp
 %{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_datadir}/apps/zeroconf/_sftp-ssh._tcp
 %{tde_tdelibdir}/tdeio_zeroconf.so
 %{tde_tdelibdir}/tdeio_zeroconf.la
 %{tde_tdelibdir}/kded_dnssdwatcher.so