RPM: add build support for Fedora 34

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

18 files changed, 96 insertions, 14 deletions

diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index a7eb41fdd..aeb681a7d 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -99,7 +99,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec
index 521c98642..25585bc0d 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -164,7 +164,7 @@ BuildRequires:	%{jack_devel}
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc34
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc34
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc34 b/redhat/main/tdebase/pamd.kdm-trinity.fc34
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc34
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+-auth       optional    pam_kwallet.so
+-auth       optional    pam_kwallet5.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet.so
+-session    optional    pam_kwallet5.so
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index c280fcb94..9a3cb11ad 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -269,6 +269,14 @@ Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
 
+# Fedora 34 Theme
+%if 0%{?fedora} == 34
+Requires:	f34-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f34/default/standard/f34.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -523,7 +531,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -752,7 +760,7 @@ BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	xorg-x11-font-utils
 %endif
 
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
 BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
diff --git a/redhat/main/tdebase/tdm.fc34.te b/redhat/main/tdebase/tdm.fc34.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc34.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+	type fprintd_t;
+	type init_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.service.fc34 b/redhat/main/tdebase/tdm.service.fc34
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc34
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index 1abe6ffbc..4902e47f6 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -91,7 +91,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec
index 29f4a6893..acdde3ba8 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -80,7 +80,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1310
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 8d08a808e..334993823 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -140,7 +140,7 @@ BuildRequires:	aspell-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -245,7 +245,7 @@ BuildRequires:	xorg-x11-devel
 Requires:		iceauth
 BuildRequires:	iceauth
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
+%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
 Requires:		xorg-x11-server-utils
 BuildRequires:	xorg-x11-server-utils
 %endif
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 346d54bad..81c47c13b 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -136,7 +136,7 @@ BuildRequires:	pcre-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -921,7 +921,9 @@ Summary:		Talk daemon for Trinity
 Group:			Applications/Internet
 Requires:		trinity-kcontrol >= %{tde_version}
 Requires:		trinity-tdebase-data >= %{tde_version}
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 33
 Requires:		xinetd
+%endif
 
 %description -n trinity-ktalkd
 KTalkd is an enhanced talk daemon - a program to handle incoming talk
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index f33e57961..eb4c9e2d8 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -97,7 +97,7 @@ BuildRequires:	brp-check-trinity
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec
index f69a3adcd..882740b2f 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -87,7 +87,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
index 64b9c9fba..92646b807 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/main/tdetoys/tdetoys.spec
@@ -86,7 +86,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 4a5e09b33..2428e00f7 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -122,7 +122,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec
index 6839d6113..dfcbcace6 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/main/tdevelop/tdevelop.spec
@@ -100,7 +100,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif