RPM: update build scripts for Fedora 33 / CentOS 8

10 files changed, 120 insertions, 5 deletions

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;
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
index 088a16c99..fa96a96ab 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -131,7 +131,14 @@ BuildRequires: ocaml
 %endif
 
 # KIG python scripting support
+%if 0%{?rhel} != 5
 %define with_kig 1
+%endif
+
+# V4L support
+%if 0%{?rhel} != 5
+%define with_v4l 1
+%endif
 
 Obsoletes:		trinity-kdeedu < %{version}-%{release}
 Provides:		trinity-kdeedu = %{version}-%{release}
@@ -149,7 +156,9 @@ Requires: trinity-keduca = %{version}-%{release}
 Requires: trinity-kgeography = %{version}-%{release}
 Requires: trinity-kgeography-data = %{version}-%{release}
 Requires: trinity-khangman = %{version}-%{release}
+%if 0%{?with_kig}
 Requires: trinity-kig = %{version}-%{release}
+%endif
 Requires: trinity-kiten = %{version}-%{release}
 Requires: trinity-klatin = %{version}-%{release}
 Requires: trinity-klettres = %{version}-%{release}
@@ -177,7 +186,9 @@ Educational/Edutainment applications, including:
 * keduca: Tests and Exams
 * kgeography: Geography Trainer
 * khangman: Hangman Game
+%if 0%{?with_kig}
 * kig: Interactive Geometry
+%endif
 * kiten: Japanese Reference/Study Tool
 * klatin: Latin Reviser
 * klettres: French alphabet tutor
@@ -473,6 +484,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 ##########
 
+%if 0%{?with_kig}
 %package -n trinity-kig
 Summary:	Interactive geometry program for TDE
 Group:		System/GUI/Other
@@ -531,6 +543,7 @@ This package is part of Trinity, as a component of the TDE education module.
 %config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc
 %config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc
 %{tde_mandir}/man1/kig*
+%endif
 
 ##########
 
@@ -1072,12 +1085,14 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_bindir}/lx200classic
 %{tde_bindir}/lx200generic
 %{tde_bindir}/lx200gps
-%{tde_bindir}/meade_lpi
 %{tde_bindir}/sbigccd
 %{tde_bindir}/skycommander
 %{tde_bindir}/temma
+%if 0%{?with_v4l}
+%{tde_bindir}/meade_lpi
 %{tde_bindir}/v4ldriver
 %{tde_bindir}/v4lphilips
+%endif
 %{tde_mandir}/man1/celestrongps*
 %{tde_mandir}/man1/fliccd*
 %{tde_mandir}/man1/indi*
@@ -1158,7 +1173,10 @@ fi
   -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
   \
   -DWITH_ALL_OPTIONS=ON \
+  %{?!with_kig:-DBUILD_KIG=OFF} \
   -DWITH_OCAML_SOLVER=OFF \
+  %{?!with_kig:-DWITH_KIG_PYTHON_SCRIPTING=OFF} \
+  %{?!with_v4l:-DWITH_V4L=OFF} \
   ..
 
 %__make %{?_smp_mflags} || %__make
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index de6aa9e8e..b2a5f6a48 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -259,6 +259,13 @@ BuildRequires:	speex-devel
 %define dont_relink 1
 %endif
 
+# Build kopete motionaway plugin
+%if 0%{?rhel} == 5
+%define global build_kopete_motionaway 0
+%else
+%define global build_kopete_motionaway 1
+%endif
+
 Obsoletes:	trinity-kdenetwork < %{version}-%{release}
 Provides:	trinity-kdenetwork = %{version}-%{release}
 Obsoletes:	trinity-kdenetwork-libs < %{version}-%{release}
@@ -695,8 +702,10 @@ Support for more IM protocols can be added through a plugin system.
 # winpopup support for kopete
 %{tde_bindir}/winpopup-install.sh
 %{tde_bindir}/winpopup-send.sh
+%if 0%{?build_kopete_motionaway}
 # motionaway plugin for kopete
 %{tde_datadir}/config.kcfg/motionawayconfig.kcfg
+%endif
 # smpp plugin for kopete
 %{tde_datadir}/config.kcfg/smpppdcs.kcfg
 # aim support is deprecated in TDE 14.1.0
@@ -1104,6 +1113,7 @@ fi
   -DBUILD_ALL=ON \
   -DBUILD_KOPETE_PLUGIN_ALL=ON \
   -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+  %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
   %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
   %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
   ..
diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec
index fb59b9c73..06caa5ca5 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -99,7 +99,7 @@ BuildRequires:	pcre-devel
 BuildRequires:	desktop-file-utils
 
 # DB5 support
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
 BuildRequires:	libdb-devel
 
 # DB4 support
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec
index 87bc405d8..6a85c31f9 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/main/tdevelop/tdevelop.spec
@@ -109,7 +109,7 @@ BuildRequires:	gamin-devel
 BuildRequires:	pcre-devel
 
 # DB5 support
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
 BuildRequires:	libdb-devel
 
 %else