RPM: update spec files for TDE 14.0.7

19 files changed, 179 insertions, 28 deletions

diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
@@ -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.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
new file mode 120000
index 000000000..ad0fc6da6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
@@ -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-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
new file mode 120000
index 000000000..5cde6e2c5
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/main/tdebase/pamd.kdm-trinity.el8
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc31 b/redhat/main/tdebase/pamd.kdm-trinity.fc31
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc31
@@ -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.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos
new file mode 120000
index 000000000..fcc6957f7
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
@@ -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.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
new file mode 120000
index 000000000..31d43e302
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.pclos2018
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index e8e3dbe50..a4c5fe6a0 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdebase
 %define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ Source6:		suse-displaymanagers-tdm
 %endif
 
 # Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
 Source7:		tdm.service%{?dist}
 %endif
 
@@ -229,7 +229,31 @@ Requires:	fedora-logos
 # Fedora 28 Theme
 %if 0%{?fedora} == 28
 Requires:	f28-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+%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:	f28-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
@@ -263,6 +287,13 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
+# RHEL 8 Theme
+%if 0%{?rhel} == 8
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%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
@@ -298,6 +329,13 @@ Requires:	mageia-theme-Default
 %define tde_starticon %{tde_datadir}/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}/oxygen/scalable/mgabutton.svg
+%endif
+
 # Mandriva 2011 Theme: "rosa"
 %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
 Requires:	mandriva-theme
@@ -381,6 +419,22 @@ Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 15.1 Theme
+%if "%{?suse_version}" == "1510"
+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
+%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
+
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -956,7 +1010,7 @@ Some random features:
 %{tde_tdeappdir}/kate.desktop
 %{tde_datadir}/apps/kate/
 %{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
-%config(noreplace) %{_sysconfdir}/trinity/katerc
+%config(noreplace) %{tde_confdir}/katerc
 %{tde_datadir}/icons/hicolor/*/apps/kate.png
 %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
 %{tde_datadir}/servicetypes/kateplugin.desktop
@@ -1357,7 +1411,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_bindir}/kreadconfig
 %{tde_bindir}/kwriteconfig
 %{tde_bindir}/kstart
-%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups
+%config(noreplace) %{tde_confdir}/kxkb_groups
 %{tde_bindir}/drkonqi
 %{tde_bindir}/crashtest
 %{tde_bindir}/kapplymousetheme
@@ -1497,7 +1551,7 @@ needed for a basic TDE desktop installation.
 
 %files data
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc
+%config(noreplace) %{tde_confdir}/tdeshorturifilterrc
 %{tde_datadir}/applnk/.hidden/battery.desktop
 %{tde_datadir}/applnk/.hidden/bwarning.desktop
 %{tde_datadir}/applnk/.hidden/cwarning.desktop
@@ -1755,7 +1809,6 @@ needed for a basic TDE desktop installation.
 # XDG directories information
 %dir %{_sysconfdir}/xdg/menus/applications-merged
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
 
@@ -2087,8 +2140,8 @@ the TDE desktop.
 
 %files -n trinity-kdesktop
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2
 %{tde_bindir}/kcheckrunning
 %{tde_bindir}/kxdglauncher
 %{tde_bindir}/tdeeject
@@ -2192,6 +2245,9 @@ already. Most users won't need this.
 %{tdm_datadir}/sessions/*.desktop
 %{tdm_datadir}/themes/
 %{tde_confdir}/%{tdm}
+%if 0%{?with_selinux_policy}
+%exclude %{tde_confdir}/%{tdm}/tdm.pp
+%endif
 %{tde_tdedocdir}/HTML/en/%{tdm}/
 %if 0%{?suse_version} == 0
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
@@ -2232,7 +2288,7 @@ already. Most users won't need this.
 
 # SELINUX policy
 %if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
+%{tde_confdir}/%{tdm}/tdm.pp
 %endif
 
 # Logrotate configuration
@@ -2241,17 +2297,17 @@ already. Most users won't need this.
 %pre -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
 if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
-  if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+  if [ -d "%{tde_confdir}/%{tdm}" ]; then
     # If there is already something under '/etc/trinity/tdm', simply delete old configuration
     echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
     rm -rf "%{tde_datadir}/config/%{tdm}"
   else
     # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
-    if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      mkdir -p "%{_sysconfdir}/trinity"
+    if [ ! -d "%{tde_confdir}" ]; then
+      mkdir -p "%{tde_confdir}"
     fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
-    mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
+    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'"
+    mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr"
   fi
 fi
 
@@ -2269,7 +2325,7 @@ fi
 
 # SELINUX context for tdm
 %if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp"
 %endif
 
 %if 0%{?fedora} == 21 || 0%{?rhel} >= 7
@@ -2288,7 +2344,7 @@ fi
 # Sets default language for TDM
 if [ "$1" = "1" ]; then
   if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
+    sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
   fi
 fi
 
@@ -2304,9 +2360,9 @@ update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanage
 
 %posttrans -n trinity-tdm
 # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
-  mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
-  rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
+if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
+  mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/"
+  rmdir "%{tde_confdir}/%{tdm}.migr/"
 fi
 
 %postun -n trinity-tdm
@@ -2549,7 +2605,7 @@ web browser if the clipboard contains a URL.
 %files -n trinity-klipper
 %defattr(-,root,root,-)
 %{tde_bindir}/klipper
-%config(noreplace) %{_sysconfdir}/trinity/klipperrc
+%config(noreplace) %{tde_confdir}/klipperrc
 %{tde_tdelibdir}/klipper.la
 %{tde_tdelibdir}/klipper.so
 %{tde_tdelibdir}/klipper_panelapplet.la
@@ -2628,7 +2684,7 @@ ever launching another application.
 
 %files -n trinity-konqueror
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
+%config(noreplace) %{tde_confdir}/konqsidebartng.rc
 %{tde_bindir}/kbookmarkmerger
 %{tde_bindir}/keditbookmarks
 %{tde_bindir}/kfmclient
@@ -3040,7 +3096,7 @@ to monitor it through the daemon running there.
 %files -n trinity-ksysguardd
 %defattr(-,root,root,-)
 %{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
+%config(noreplace) %{tde_confdir}/ksysguarddrc
 
 ##########
 
@@ -3179,7 +3235,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
 
 %files libtqt3-integration
 %defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/
+%{_libdir}/tqt3/plugins/integration/
 %{tde_tdelibdir}/kded_kdeintegration.la
 %{tde_tdelibdir}/kded_kdeintegration.so
 %{tde_datadir}/services/kded/kdeintegration.desktop
@@ -3357,8 +3413,8 @@ fi
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
   -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
   \
   -DWITH_ALL_OPTIONS=ON \
@@ -3470,7 +3526,7 @@ EOF
 %endif
 
 # TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
+%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
@@ -3507,7 +3563,7 @@ fi
 
 # SELINUX policy for RHEL / Fedora
 %if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
 %endif
 
 # Mageia icon for TDE menu
diff --git a/redhat/main/tdebase/tdm.el8.pp b/redhat/main/tdebase/tdm.el8.pp
new file mode 120000
index 000000000..3d25dc4f0
--- /dev/null
+++ b/redhat/main/tdebase/tdm.el8.pp
@@ -0,0 +1 @@
+tdm.el7.pp
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc31.pp b/redhat/main/tdebase/tdm.fc31.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc31.pp
diff --git a/redhat/main/tdebase/tdm.service.el8 b/redhat/main/tdebase/tdm.service.el8
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.el8
@@ -0,0 +1 @@
+tdm.service.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/main/tdebase/tdm.service.fc31
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc31
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
[email protected]
+After=systemd-user-sessions.service [email protected] plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga6 b/redhat/main/tdebase/tdm.service.mga6
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga6
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
[email protected]
+After=systemd-user-sessions.service [email protected] plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga7 b/redhat/main/tdebase/tdm.service.mga7
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga7
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
[email protected]
+After=systemd-user-sessions.service [email protected] plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service