From b54445a6aa380d4cc4de5cd12254d7bdb77ceab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 18 May 2022 21:29:45 +0200 Subject: [PATCH] RPM: tdebase: cleanup old distribution-specific files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- .../main/tdebase/pamd.kcheckpass-trinity.el4 | 11 - .../main/tdebase/pamd.kcheckpass-trinity.fc30 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.fc31 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.fc32 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.fc33 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.mga5 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.mga6 | 5 - .../main/tdebase/pamd.kcheckpass-trinity.mga7 | 5 - redhat/main/tdebase/pamd.kdm-trinity-np.el4 | 9 - redhat/main/tdebase/pamd.kdm-trinity-np.fc30 | 16 - redhat/main/tdebase/pamd.kdm-trinity-np.fc31 | 16 - redhat/main/tdebase/pamd.kdm-trinity-np.fc32 | 16 - redhat/main/tdebase/pamd.kdm-trinity-np.fc33 | 16 - redhat/main/tdebase/pamd.kdm-trinity-np.mga5 | 11 - redhat/main/tdebase/pamd.kdm-trinity-np.mga6 | 11 - redhat/main/tdebase/pamd.kdm-trinity-np.mga7 | 11 - redhat/main/tdebase/pamd.kdm-trinity.el4 | 11 - redhat/main/tdebase/pamd.kdm-trinity.fc30 | 23 -- redhat/main/tdebase/pamd.kdm-trinity.fc31 | 23 -- redhat/main/tdebase/pamd.kdm-trinity.fc32 | 23 -- redhat/main/tdebase/pamd.kdm-trinity.fc33 | 23 -- redhat/main/tdebase/pamd.kdm-trinity.mga5 | 15 - redhat/main/tdebase/pamd.kdm-trinity.mga6 | 15 - redhat/main/tdebase/pamd.kdm-trinity.mga7 | 15 - .../tdebase/pamd.kscreensaver-trinity.el4 | 11 - .../tdebase/pamd.kscreensaver-trinity.fc30 | 5 - .../tdebase/pamd.kscreensaver-trinity.fc31 | 5 - .../tdebase/pamd.kscreensaver-trinity.fc32 | 5 - .../tdebase/pamd.kscreensaver-trinity.fc33 | 5 - .../tdebase/pamd.kscreensaver-trinity.mga5 | 5 - .../tdebase/pamd.kscreensaver-trinity.mga6 | 5 - .../tdebase/pamd.kscreensaver-trinity.mga7 | 5 - redhat/main/tdebase/tdebase.spec | 273 +----------------- redhat/main/tdebase/tdm.fc30.te | 11 - redhat/main/tdebase/tdm.fc31.te | 11 - redhat/main/tdebase/tdm.fc32.te | 11 - redhat/main/tdebase/tdm.fc33.te | 11 - 37 files changed, 6 insertions(+), 657 deletions(-) delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.el4 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 delete mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.el4 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc30 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc31 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc32 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc33 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.mga5 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.mga6 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.mga7 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.el4 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc30 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc31 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc32 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc33 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.mga5 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.mga6 delete mode 100644 redhat/main/tdebase/pamd.kdm-trinity.mga7 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.el4 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 delete mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 delete mode 100644 redhat/main/tdebase/tdm.fc30.te delete mode 100644 redhat/main/tdebase/tdm.fc31.te delete mode 100644 redhat/main/tdebase/tdm.fc32.te delete mode 100644 redhat/main/tdebase/tdm.fc33.te diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el4 deleted file mode 100644 index 48e0276a6..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4 +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_stack.so service=system-auth -auth required pam_nologin.so -auth sufficient pam_timestamp.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth -session required pam_loginuid.so -session optional pam_timestamp.so -session optional pam_selinux.so -session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.fc31 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.fc32 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.fc33 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.mga5 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.mga6 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kcheckpass-trinity.mga7 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.el4 b/redhat/main/tdebase/pamd.kdm-trinity-np.el4 deleted file mode 100644 index 687312da5..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.el4 +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_nologin.so -auth required pam_permit.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth -session required pam_loginuid.so -session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 +++ /dev/null @@ -1,16 +0,0 @@ - #%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-np.fc31 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 +++ /dev/null @@ -1,16 +0,0 @@ - #%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-np.fc32 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 +++ /dev/null @@ -1,16 +0,0 @@ - #%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-np.fc33 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 +++ /dev/null @@ -1,16 +0,0 @@ - #%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-np.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 deleted file mode 100644 index f884c1de6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 +++ /dev/null @@ -1,11 +0,0 @@ -#%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-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 deleted file mode 100644 index f884c1de6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 +++ /dev/null @@ -1,11 +0,0 @@ -#%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-np.mga7 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 deleted file mode 100644 index f884c1de6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 +++ /dev/null @@ -1,11 +0,0 @@ -#%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.el4 b/redhat/main/tdebase/pamd.kdm-trinity.el4 deleted file mode 100644 index 48e0276a6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.el4 +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_stack.so service=system-auth -auth required pam_nologin.so -auth sufficient pam_timestamp.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth -session required pam_loginuid.so -session optional pam_timestamp.so -session optional pam_selinux.so -session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc30 b/redhat/main/tdebase/pamd.kdm-trinity.fc30 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc30 +++ /dev/null @@ -1,23 +0,0 @@ -#%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.kdm-trinity.fc31 b/redhat/main/tdebase/pamd.kdm-trinity.fc31 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc31 +++ /dev/null @@ -1,23 +0,0 @@ -#%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.kdm-trinity.fc32 b/redhat/main/tdebase/pamd.kdm-trinity.fc32 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc32 +++ /dev/null @@ -1,23 +0,0 @@ -#%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.kdm-trinity.fc33 b/redhat/main/tdebase/pamd.kdm-trinity.fc33 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc33 +++ /dev/null @@ -1,23 +0,0 @@ -#%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.kdm-trinity.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5 deleted file mode 100644 index cb0982c9a..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga5 +++ /dev/null @@ -1,15 +0,0 @@ -#%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.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6 deleted file mode 100644 index cb0982c9a..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga6 +++ /dev/null @@ -1,15 +0,0 @@ -#%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.kdm-trinity.mga7 b/redhat/main/tdebase/pamd.kdm-trinity.mga7 deleted file mode 100644 index cb0982c9a..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga7 +++ /dev/null @@ -1,15 +0,0 @@ -#%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.el4 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el4 deleted file mode 100644 index 48e0276a6..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el4 +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_stack.so service=system-auth -auth required pam_nologin.so -auth sufficient pam_timestamp.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth -session required pam_loginuid.so -session optional pam_timestamp.so -session optional pam_selinux.so -session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.fc32 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.fc33 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 +++ /dev/null @@ -1,5 +0,0 @@ -#%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.kscreensaver-trinity.mga7 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 +++ /dev/null @@ -1,5 +0,0 @@ -#%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 5737e230b..a55191316 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -120,167 +120,10 @@ BuildRequires: brp-check-trinity ### Distribution-specific settings ### -# Fedora 15 Theme: "Lovelock" -%if 0%{?fedora} == 15 -Requires: lovelock-backgrounds-single -%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 16 Theme: "Verne" -%if 0%{?fedora} == 16 -Requires: verne-backgrounds-single -%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 17 Theme: "Beefy Miracle" -%if 0%{?fedora} == 17 -Requires: beefy-miracle-backgrounds-single -%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 18 Theme: "Spherical Cow" -%if 0%{?fedora} == 18 -Requires: spherical-cow-backgrounds-single -%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 19 Theme: "Schroedinger's cat" -%if 0%{?fedora} == 19 -Requires: schroedinger-cat-backgrounds-base -%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 20 Theme: "Heisenbug" -%if 0%{?fedora} == 20 -Requires: heisenbug-backgrounds-base -%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 21 Theme -%if 0%{?fedora} == 21 -Requires: f21-backgrounds-base -%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 22 Theme -%if 0%{?fedora} == 22 -Requires: f22-backgrounds-base -%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 23 Theme -%if 0%{?fedora} == 23 -Requires: f23-backgrounds-base -%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 24 Theme -%if 0%{?fedora} == 24 -Requires: f24-backgrounds-base -%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 25 Theme -%if 0%{?fedora} == 25 -Requires: f25-backgrounds-base -%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 26 Theme -%if 0%{?fedora} == 26 -Requires: f26-backgrounds-base -%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 27 Theme -%if 0%{?fedora} == 27 -Requires: f27-backgrounds-base -%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 28 Theme -%if 0%{?fedora} == 28 -Requires: f28-backgrounds-base -%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 29 Theme -%if 0%{?fedora} == 29 -Requires: f29-backgrounds-base -%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 30 Theme -%if 0%{?fedora} == 30 -Requires: f30-backgrounds-base -%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 31 Theme -%if 0%{?fedora} == 31 -Requires: f31-backgrounds-base -%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 32 Theme -%if 0%{?fedora} == 32 -Requires: f32-backgrounds-base -%define tde_bg /usr/share/backgrounds/f32/default/standard/f32.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -%endif - -# Fedora 33 Theme -%if 0%{?fedora} == 33 -Requires: f33-backgrounds-base -%define tde_bg /usr/share/backgrounds/f33/default/standard/f33.png -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 - -# Fedora 35 Theme -%if 0%{?fedora} == 35 -Requires: f35-backgrounds-base -%define tde_bg /usr/share/backgrounds/f35/default/standard/f35.png +# Fedora Theme +%if 0%{?fedora} +Requires: f%{?fedora}-backgrounds-base +%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif @@ -321,50 +164,8 @@ Requires: redhat-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif -# Mageia 2 Theme -%if 0%{?mgaversion} == 2 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg -%endif - -# Mageia 3 Theme -%if 0%{?mgaversion} == 3 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg -%endif - -# Mageia 4 Theme -%if 0%{?mgaversion} == 4 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg -%endif - -# Mageia 5 Theme -%if 0%{?mgaversion} == 5 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg -%endif - -# Mageia 6 Theme -%if 0%{?mgaversion} == 6 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg -%endif - -# Mageia 7 Theme -%if 0%{?mgaversion} == 7 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg -%endif - -# Mageia 8 Theme -%if 0%{?mgaversion} == 8 +# Mageia Theme +%if 0%{?mgaversion} Requires: mageia-theme-Default %define tde_bg /usr/share/mga/backgrounds/default.jpg %define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg @@ -383,68 +184,6 @@ Requires: desktop-common-data %define tde_starticon /usr/share/icons/pclinuxos.png %endif -# OpenSuse 11.4 Theme -%if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 12.2 Theme -%if "%{?suse_version}" == "1220" -Requires: wallpaper-branding = 12.2 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 12.3 Theme -%if "%{?suse_version}" == "1230" -Requires: wallpaper-branding = 12.3 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 13.1 Theme -%if "%{?suse_version}" == "1310" -Requires: wallpaper-branding = 13.1 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 13.2 Theme -%if "%{?suse_version}" == "1320" -Requires: wallpaper-branding = 13.2 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 42.1 Theme -%if "%{?sle_version}" == "120100" -Requires: wallpaper-branding = 42.1 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 42.2 Theme -%if "%{?sle_version}" == "120200" -Requires: wallpaper-branding -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse 42.3 Theme -%if "%{?sle_version}" == "120300" -Requires: wallpaper-branding -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - # OpenSuse 15.x Theme %if "%{?suse_version}" == "1500" Requires: wallpaper-branding diff --git a/redhat/main/tdebase/tdm.fc30.te b/redhat/main/tdebase/tdm.fc30.te deleted file mode 100644 index afe6de52a..000000000 --- a/redhat/main/tdebase/tdm.fc30.te +++ /dev/null @@ -1,11 +0,0 @@ - -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.fc31.te b/redhat/main/tdebase/tdm.fc31.te deleted file mode 100644 index afe6de52a..000000000 --- a/redhat/main/tdebase/tdm.fc31.te +++ /dev/null @@ -1,11 +0,0 @@ - -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.fc32.te b/redhat/main/tdebase/tdm.fc32.te deleted file mode 100644 index afe6de52a..000000000 --- a/redhat/main/tdebase/tdm.fc32.te +++ /dev/null @@ -1,11 +0,0 @@ - -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.fc33.te b/redhat/main/tdebase/tdm.fc33.te deleted file mode 100644 index afe6de52a..000000000 --- a/redhat/main/tdebase/tdm.fc33.te +++ /dev/null @@ -1,11 +0,0 @@ - -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;