RPM: add support for Mageia 8

6 files changed, 51 insertions, 1 deletions

diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
@@ -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.mga8 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga8
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga8
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga8 b/redhat/main/tdebase/pamd.kdm-trinity.mga8
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.mga8
@@ -0,0 +1,15 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_succeed_if.so 
+auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
+auth       substack    system-auth
+-auth      optional    pam_kwallet.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
@@ -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 f8f5131f1..48a837c3e 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -775,7 +775,7 @@ BuildRequires:		libr-devel >= 0.6.0
 %endif
 
 # RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
 BuildRequires:		libtirpc-devel
 BuildRequires:		rpcgen
 %if 0%{?fedora}
@@ -1486,7 +1486,9 @@ TDE applications, particularly those in the TDE base module.
 %{tde_libdir}/libtdeinit_kxkb.la
 %{tde_libdir}/libtdeinit_kxkb.so
 %{tde_libdir}/libkhotkeys_shared.so.*
+%if "%{?tde_version}" != "14.0.9"
 %{tde_tdeappdir}/kdcop.desktop
+%endif
 %{tde_tdeappdir}/keyboard.desktop
 %{tde_tdeappdir}/keyboard_layout.desktop
 %{tde_tdeappdir}/khotkeys.desktop
diff --git a/redhat/main/tdebase/tdm.service.mga8 b/redhat/main/tdebase/tdm.service.mga8
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga8
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service