summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2022-05-18 21:27:54 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2022-05-20 09:50:17 +0200
commitcd2a65fac033856bdbabdf029370ba95fdfd4b13 (patch)
tree81adb30f96f94e506cf864a8befcab0c787e4443 /redhat/main
parent140815e63d361d63d7bb4dd7691c174c26e9e99e (diff)
downloadtde-packaging-cd2a65fac033856bdbabdf029370ba95fdfd4b13.tar.gz
tde-packaging-cd2a65fac033856bdbabdf029370ba95fdfd4b13.zip
RPM: updates for Fedora 36
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc365
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc3616
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc3623
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc365
-rw-r--r--redhat/main/tdebase/tdm.fc36.te11
-rw-r--r--redhat/main/tdebase/tdm.service.fc3612
-rw-r--r--redhat/main/tdenetwork/tdenetwork.spec25
7 files changed, 91 insertions, 6 deletions
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kdm-trinity.fc36
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
@@ -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/tdm.fc36.te b/redhat/main/tdebase/tdm.fc36.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc36.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/tdebase/tdm.service.fc36 b/redhat/main/tdebase/tdm.service.fc36
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc36
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 06a5369c0..c7681f983 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -175,12 +175,9 @@ BuildRequires: libXxf86vm-devel
## Conditional build:
# RHEL6: xmms is outdated !
#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
# Wifi support
-%if "%{?_with_wifi:1}" == "1"
+%define with_wifi 1
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
BuildRequires: wireless-tools-devel
%endif
@@ -193,7 +190,6 @@ BuildRequires: wireless-tools
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
BuildRequires: libiw-devel
%endif
-%endif
# OpenSLP support
%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -288,7 +284,9 @@ Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_wifi}
Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -311,7 +309,9 @@ Networking applications, including:
* krfb: Desktop Sharing server, allow others to access your desktop via VNC
* ksirc: IRC client for Trinity
* ktalkd: Talk daemon for Trinity
+%if 0%{?with_wifi}
* kwifimanager: Wireless lan manager for Trinity
+%endif
* librss: RSS library for Trinity
* lisa: lan information server
@@ -947,7 +947,8 @@ and shouldn't be run on a multi-user machine.
##########
-%if "%{?_with_wifi:1}" == "1"
+%if 0%{?with_wifi}
+
%package -n trinity-kwifimanager
Summary: Wireless lan manager for Trinity
Group: Applications/Internet
@@ -973,6 +974,7 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
%{tde_tdedocdir}/HTML/en/kwifimanager/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
+
%endif
##########
@@ -1064,8 +1066,10 @@ A tdeioslave and tded module that provide Zeroconf support. Try
# Workaround libiw detection failure on opensuse
%if 0%{?suse_version}
+%if 0%{?with_wifi}
%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
%endif
+%endif
# Update icons for some control center modules
%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
@@ -1115,6 +1119,7 @@ fi
%{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
%{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
%{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
+ %{!?with_wifi:-DBUILD_WIFI=OFF} \
..
# Tdenetwork is not smp safe !
@@ -1177,6 +1182,12 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
fi
done
+# Remove unwanted doc
+%if 0%{?with_wifi} == 0
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/"
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kwifimanager/"
+%endif
+
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file kcmkrfb
@@ -1189,8 +1200,10 @@ done
%suse_update_desktop_file -r krdc System RemoteAccess
%suse_update_desktop_file -r krfb System RemoteAccess
%suse_update_desktop_file -r kget System TrayIcon
+%if 0%{?with_wifi}
%suse_update_desktop_file -r kwifimanager System Network
%suse_update_desktop_file kcmwifi
+%endif
%suse_update_desktop_file -u knewsticker-standalone Network News
%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
%endif