RPM: add support for Fedora 39

Signed-off-by: François Andriot <albator78@libertysurf.fr>

6 files changed, 81 insertions, 1 deletions

diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
@@ -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/core/tdebase/pamd.kdm-trinity-np.fc39 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
@@ -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/core/tdebase/pamd.kdm-trinity.fc39 b/redhat/core/tdebase/pamd.kdm-trinity.fc39
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc39
@@ -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/core/tdebase/pamd.kscreensaver-trinity.fc39 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
@@ -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/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc39.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/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index 17749989e..edd8e4e43 100644
--- a/redhat/core/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -85,7 +85,9 @@ BuildRequires:	net-snmp-devel
 BuildRequires:	gmp-devel
 
 # PYTHON support
+%if "%{python}" == ""
 %global python python3
+%endif
 %global __python %__python3
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
@@ -169,6 +171,7 @@ BuildRequires:	openssl-devel
 %define dont_relink 1
 %endif
 
+%define build_superkaramba 1
 %define build_tdefilereplace 1
 
 Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -189,7 +192,9 @@ Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?build_superkaramba}
 Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 %if 0%{?build_tdefilereplace}
 Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
@@ -754,6 +759,8 @@ keeps a master password to all wallets.
 
 ##########
 
+%if 0%{?build_superkaramba}
+
 %package -n trinity-superkaramba
 Summary:	A program based on karamba improving the eyecandy of TDE
 Group:		Applications/Utilities
@@ -783,6 +790,8 @@ Here are just some examples of the things that can be done:
 %{tde_tdedocdir}/HTML/en/superkaramba/
 %{tde_mandir}/man1/superkaramba.1*
 
+%endif
+
 ##########
 
 %if 0%{?build_tdefilereplace}
@@ -868,7 +877,7 @@ This package contains the development files for tdeutils.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 && 0%{?build_superkaramba}
 # Reverts some older Python stuff
 %__sed -i "superkaramba/src/"*".cpp" \
        -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
@@ -912,6 +921,11 @@ fi
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
   \
+%if 0%{?fedora} == 39
+  -DPYTHON_LIBRARY="%{_libdir}/libpython3.11.so.1.0" \
+  -DPYTHON_INCLUDE_DIR="%{_includedir}/python3.11" \
+%endif
+  \
   -DWITH_DPMS=ON \
   %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
   -DWITH_ASUS=ON \
@@ -926,6 +940,8 @@ fi
   -DWITH_TDENEWSTUFF=ON \
   -DBUILD_ALL=ON \
   %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
+  %{?!build_superkaramba:-DBUILD_SUPERKARAMBA=OFF} \
+  %{?!build_tdefilereplace:-DBUILD_TDEFILEREPLACE=OFF} \
   ..
    
 %__make %{?_smp_mflags} || %__make
@@ -969,14 +985,18 @@ export PATH="%{tde_bindir}:${PATH}"
 # Fix desktop shortcut location
 if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
   %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%if 0%{?build_superkaramba}
   %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+%endif
   %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
 fi
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file KEdit              Utility TextEditor
+%if 0%{?build_superkaramba}
 %suse_update_desktop_file superkaramba       Utility DesktopUtility
+%endif
 %suse_update_desktop_file KCharSelect        Utility Accessibility
 %suse_update_desktop_file khexedit           Utility Editor
 %suse_update_desktop_file Kjots              Utility TimeUtility