RPM: many updates for upcoming R14.1.3

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 91 insertions, 72 deletions

diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 570e9ced6..621f4fc65 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -63,8 +63,11 @@ Source1:		%{name}-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
-%if 0%{?mdkver}
-Source2:		pamd.tde.omv5000
+%if 0%{?mdkver} >= 5000000
+Source2:		pamd.kdm-trinity.omv
+Source3:		pamd.kdm-trinity-np.omv
+Source4:		pamd.kcheckpass-trinity.omv
+Source5:		pamd.kscreensaver-trinity.omv
 %else
 Source2:		pamd.kdm-trinity%{?dist}
 Source3:		pamd.kdm-trinity-np%{?dist}
@@ -128,7 +131,11 @@ BuildRequires:	brp-check-trinity
 # Fedora Theme
 %if 0%{?fedora}
 Requires:	f%{?fedora}-backgrounds-base
+%if 0%{?fedora} >= 39
+%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png
+%else
 %define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png
+%endif
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
@@ -192,7 +199,7 @@ Requires:	mandriva-theme
 %endif
 
 # OpenMandriva
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 Requires:	distro-release-theme
 %define tde_bg /usr/share/wallpapers/default.png
 %endif
@@ -231,7 +238,7 @@ BuildRequires:	fdupes
 BuildRequires:	htdig
 
 # OPENSSL support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}openssl-devel
 %else
 BuildRequires:	openssl-devel
@@ -241,7 +248,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	audiofile-devel
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
@@ -255,8 +262,12 @@ BuildRequires:	libraw1394-devel
 %endif
 
 # VORBIS support
-%if 0%{?mdkver} || 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
+%define libvorbis_devel %{_lib}vorbis0-devel
+%else
 %define libvorbis_devel %{_lib}vorbis-devel
+%endif
 %else
 %define libvorbis_devel libvorbis-devel
 %endif
@@ -268,9 +279,16 @@ BuildRequires:	glib2-devel
 # PCRE support
 BuildRequires:	pcre-devel
 
+# PCRE2 support
+%if 0%{?mdkver} >= 5000000
+BuildRequires:	%{_lib}pcre2-devel
+%else
+BuildRequires:	pcre2-devel
+%endif
+
 # SASL support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}sasl-devel
 %else
 BuildRequires:	%{_lib}sasl2-devel
@@ -297,7 +315,7 @@ BuildRequires:	libusb-devel
 %endif
 
 # ESOUND support
-#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
 #define with_esound 1
 #BuildRequires:	esound-devel
 #endif
@@ -307,14 +325,14 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
 
 # OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	lib64ldap-devel
 %else
 BuildRequires:	openldap-devel
@@ -328,7 +346,7 @@ BuildRequires:	openldap24-libs-devel
 %endif
 
 # SENSORS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel}
 BuildRequires:	lm_sensors-devel
 %endif
 %if 0%{?suse_version}
@@ -337,12 +355,16 @@ BuildRequires:	libsensors4-devel
 
 # TSAK support (requires libudev-devel)
 #  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
 %if 0%{?suse_version} >= 1310
 BuildRequires:	udev
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
+BuildRequires:	%{_lib}udev1-devel
+%else
 BuildRequires:	%{_lib}udev-devel
+%endif
 %else
 BuildRequires:	libudev-devel
 %endif
@@ -359,13 +381,13 @@ BuildRequires:	libacl-devel
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
 %define with_xrandr 1
 %endif
 
 # XTEST support
 #  On RHEL4, xtest library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xtest 1
 %endif
 
@@ -378,9 +400,9 @@ BuildRequires:	hal-devel >= 0.5
 
 # OPENEXR support
 #  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_exr 1
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}openexr-devel
 %else
 BuildRequires:	OpenEXR-devel
@@ -394,7 +416,7 @@ BuildRequires:	OpenEXR-devel
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
 #  RHEL 9: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -416,7 +438,7 @@ BuildRequires:	xscreensaver-data
 BuildRequires:	xscreensaver-data-extra
 %endif
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %if 0%{?mgaversion} >= 4
 BuildRequires:	%{_lib}xscrnsaver-devel
 %else
@@ -433,21 +455,20 @@ BuildRequires:	xscreensaver-gl
 
 # AVAHI support
 #  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libavahi-tqt-devel
 %endif
 
 # MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
-BuildRequires: %{_lib}glu-devel
-%else
-BuildRequires: mesaglu-devel
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
 %endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
@@ -478,7 +499,7 @@ BuildRequires:	libart_lgpl-devel
 %if 0%{?rhel} == 4
 BuildRequires:	samba-common
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
 %if 0%{?mdkver}
 BuildRequires:	%{_lib}smbclient-devel
 %else
@@ -487,7 +508,7 @@ BuildRequires:	libsmbclient-devel
 %endif
 
 # IMAKE
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220
 BuildRequires:	imake
 %endif
 
@@ -495,19 +516,19 @@ BuildRequires:	imake
 %if 0%{?suse_version} == 1140
 BuildRequires:	xorg-x11-libxkbfile-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
-%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1210
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 BuildRequires:	%{_lib}xkbfile-devel
 %else
 BuildRequires:	libxkbfile-devel
 %endif
-%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?mdkver} >= 5000000 || 0%{?rhel} >= 7
 BuildRequires:	xkeyboard-config-devel
 %endif
 %endif
 
 # XDMCP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %if 0%{?mgaversion} >= 4
 BuildRequires:	%{_lib}xdmcp-devel
 %else
@@ -519,7 +540,7 @@ BuildRequires:	libXdmcp-devel
 %endif
 
 # XTST support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %if 0%{?mgaversion} >= 4
 %define xtst_devel %{_lib}xtst-devel
 %else
@@ -532,7 +553,7 @@ BuildRequires:	libXdmcp-devel
 %{?xtst_devel:BuildRequires: %{xtst_devel}}
 
 # XDAMAGE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 BuildRequires:	%{_lib}xdamage-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
@@ -546,7 +567,7 @@ BuildRequires:	usbutils
 %if 0%{?suse_version} == 1140
 BuildRequires:	xorg-x11-libfontenc-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220
 BuildRequires:	libfontenc-devel
 %endif
 
@@ -555,7 +576,7 @@ BuildRequires:	libfontenc-devel
 BuildRequires:	xorg-x11-devel
 %endif
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 BuildRequires:	x11-font-util
 BuildRequires:	x11-proto-devel
 %endif
@@ -576,17 +597,17 @@ BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
 
-%if 0%{?mdkver} < 24090000
-%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} < 5000000
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 BuildRequires:	drakconf
 %endif
 %endif
 
 # LIBCONFIG support
 # Needed for "compton" stuff
-%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 %define with_libconfig 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 BuildRequires:	%{_lib}config-devel
 %else
 BuildRequires:	libconfig-devel
@@ -594,12 +615,12 @@ BuildRequires:	libconfig-devel
 %endif
 
 # KBDLEDSYNC support
-%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 %define with_kbdledsync 1
 %endif
 
 # TDERANDR support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
 %define with_tderandrtray 1
 %endif
 
@@ -621,7 +642,7 @@ BuildRequires:		libnsl-devel
 %endif
 
 # ATTR support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %define libattr_devel %{_lib}attr-devel
 %else
 %define libattr_devel libattr-devel
@@ -1223,6 +1244,15 @@ plugdev group.
 %{tde_tdeappdir}/tdehwdevicetray.desktop
 %{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
 
+# tdesyndaemon
+%{tde_bindir}/tdesyndaemon
+%{tde_tdeappdir}/touchpad.desktop
+%{tde_datadir}/apps/tdeconf_update/remote_folder_icon.upd
+%{tde_datadir}/apps/tdeconf_update/remote_folder_icon_upd.sh
+%{tde_datadir}/icons/crystalsvg/*/devices/input-touchpad.png
+%{tde_datadir}/icons/crystalsvg/scalable/devices/input-touchpad.svg
+%{tde_datadir}/services/kded/khotkeys.desktop
+
 # The following features are not compiled under RHEL 5 and older
 %if 0%{?with_tderandrtray}
 %{tde_bindir}/tderandrtray
@@ -1314,8 +1344,6 @@ TDE applications, particularly those in the TDE base module.
 %{tde_tdelibdir}/kcminit_startup.so
 %{tde_tdelibdir}/kcm_keyboard.la
 %{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
 %{tde_tdelibdir}/kcm_khotkeys.la
 %{tde_tdelibdir}/kcm_khotkeys.so
 %{tde_tdelibdir}/kded_khotkeys.la
@@ -1894,8 +1922,6 @@ group.
 %{tde_tdedocdir}/HTML/en/tdeioslave/
 %{tde_mandir}/man1/ktrash.1*
 %{tde_mandir}/man1/tdeio_media_mounthelper.1*
-%{tde_mandir}/man1/tdeio_system_documenthelper.1*
-
 %if 0%{?with_exr}
 %{tde_tdelibdir}/exrthumbnail.la
 %{tde_tdelibdir}/exrthumbnail.so
@@ -2038,7 +2064,7 @@ Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 Requires:	xdg-utils
 %endif
 
@@ -2094,7 +2120,7 @@ Requires:	pam
 Requires:	logrotate
 
 # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 4
 Requires:	xinitrc
 %endif
 %if 0%{?suse_version} == 1140
@@ -2112,7 +2138,7 @@ Requires:	xorg-x11-xinit
 Provides:	service(graphical-login)
 %endif
 # Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 Provides:	dm
 Provides:	%{tdm}
 %endif
@@ -2183,15 +2209,15 @@ already. Most users won't need this.
 %if 0%{?suse_version} >= 1210
 /usr/lib/X11/displaymanagers/
 %endif
-%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} >= 7
 /usr/lib/systemd/system/tdm.service
 %endif
-%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %{_datadir}/xsessions/tde.desktop
 %endif
 
 # https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %{_sysconfdir}/X11/wmsession.d/45TDE
 %{_datadir}/X11/dm.d/45TDE.conf
 %endif
@@ -2229,7 +2255,7 @@ if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ;
 fi
 
 %post -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %make_session
 %endif
 
@@ -2276,7 +2302,7 @@ if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
 fi
 
 %postun -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %make_session
 %endif
 
@@ -2683,7 +2709,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%if 0%{?mdkver} < 24090000
+%if 0%{?mdkver} < 5000000
 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
 %endif
@@ -2705,7 +2731,7 @@ ever launching another application.
 %{tde_mandir}/man1/kfmclient.1*
 %{tde_mandir}/man1/konqueror.1*
 
-%if 0%{?mdkver} < 24090000
+%if 0%{?mdkver} < 5000000
 
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
@@ -2905,8 +2931,8 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
 %endif
 
 %postun -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver} < 24090000
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver} < 5000000
 fndSession
 %endif
 %endif
@@ -3407,7 +3433,7 @@ fi
 %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
   -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
 %endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?pclinuxos}
   -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
 %endif
   ..
@@ -3434,7 +3460,7 @@ fi
 
 # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
 # Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
 cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
 NAME=TDE
@@ -3457,28 +3483,21 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
 %if 0%{?mgaversion} >= 6
 FNDSESSION_EXEC="/usr/sbin/chksession -l"
 %endif
-EOF
 %endif
+EOF
 %endif
 
 # PAM configuration files (except openSUSE)
 %if 0%{?suse_version} == 0
-%if 0%{?mdkver}
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
-%else
 %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
 %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
 %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
 %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
 %endif
-%endif
 
 # TDM configuration
 %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} || 0%{?pclinuxos}
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3493,7 +3512,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
   %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 fi
 
-%if 0%{?mdkver} < 24090000
+%if 0%{?mdkver} < 5000000
 # Makes 'media_safelyremove.desktop' an alternative.
 # This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"