From effbf509eea4f37a1a8660242769ed1746b67ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 23:53:31 +0100 Subject: RPM: update build scripts for Fedora 33 / CentOS 8 --- redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 | 5 ++++ redhat/main/tdebase/pamd.kdm-trinity-np.fc33 | 16 +++++++++++ redhat/main/tdebase/pamd.kdm-trinity.fc33 | 23 ++++++++++++++++ redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 | 5 ++++ redhat/main/tdebase/tdebase.spec | 31 ++++++++++++++++++++-- redhat/main/tdebase/tdm.fc33.te | 11 ++++++++ 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.fc33 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.fc33 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 create mode 100644 redhat/main/tdebase/tdm.fc33.te (limited to 'redhat/main/tdebase') diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 @@ -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.fc33 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 @@ -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.fc33 b/redhat/main/tdebase/pamd.kdm-trinity.fc33 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc33 @@ -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.fc33 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 @@ -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 cf33058c7..0683fd7be 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -261,6 +261,14 @@ 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 + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -430,6 +438,14 @@ Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif +# OpenSuse 15.2 Theme +%if "%{?suse_version}" == "1520" +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 TW Theme %if "%{?suse_version}" == "1550" Requires: wallpaper-branding @@ -2386,7 +2402,9 @@ fi # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 -update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : +if [ "$1" = "0" ]; then + update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : +fi %endif ########## @@ -3341,6 +3359,15 @@ Windows and Samba shares. %if 0%{?suse_version} %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %endif +%if 0%{?suse_version} >= 1550 +# /etc/X11 moved to /usr/etc/X11 on opensuse TW +%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \ + -i "%{tdm}/README" \ + -i "doc/adminguide/index.docbook" \ + -i "doc/faq/notrelated.docbook" \ + -e "s|/etc/X11/xdm|/usr/etc/X11/xdm|g" \ + -e "s|/etc/X11/sessions|/usr/etc/X11/sessions|g" +%endif # Reboot command location may vary on some distributions if [ -x "/usr/bin/reboot" ]; then @@ -3613,7 +3640,7 @@ EOF # Move faces icon to XDG directory '/usr/share/faces' if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then %__mkdir_p "%{?buildroot}%{_datadir}/faces" - %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" + %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" 2>/dev/null rmdir "%{?buildroot}%{tdm_datadir}/pics/users" fi %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users" diff --git a/redhat/main/tdebase/tdm.fc33.te b/redhat/main/tdebase/tdm.fc33.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/main/tdebase/tdm.fc33.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; -- cgit v1.2.1