diff --git a/from-callmetango/plasma-login-manager/plasma-login-manager.spec b/from-callmetango/plasma-login-manager/plasma-login-manager.spec index fca27c9..aeffd69 100644 --- a/from-callmetango/plasma-login-manager/plasma-login-manager.spec +++ b/from-callmetango/plasma-login-manager/plasma-login-manager.spec @@ -1,21 +1,13 @@ -# Disable X11 for RHEL -%bcond x11 %[%{undefined rhel}] - -%global commit c96b1944419fb49837253705be41961f2b3e6159 -%global shortcommit %{sub %{commit} 1 7} -%global commitdate 20260112 -%global gititer 1 -Name: plasma-login-manager +Name: sonic-login-manager Version: 6.6.4 -Release: 1%{?dist} +Release: 10%{?dist} License: BSD-3-Clause and CC0-1.0 and (GPL-2.0-only or GPL-3.0-only) and GPL-2.0-or-later and LGPL-2.0-or-later and LGPL-2.1-or-later -Summary: QML based login manager from KDE +Summary: QML based login manager for SonicDE -URL: https://invent.kde.org/plasma/plasma-login-manager -Source0: http://download.kde.org/%{stable_kf6}/plasma/%{maj_ver_kf6}.%{min_ver_kf6}.%{bug_ver_kf6}/%{name}-%{version}.tar.xz -Source1: http://download.kde.org/%{stable_kf6}/plasma/%{maj_ver_kf6}.%{min_ver_kf6}.%{bug_ver_kf6}/%{name}-%{version}.tar.xz.sig +URL: https://github.com/Sonic-DE/sonic-login-manager +Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # README.scripts Source10: README.scripts @@ -33,12 +25,10 @@ Source13: plasmalogin.conf # upstream patches # proposed patches - -# downstream patches -## plasmalogin.service: +EnvironmentFile=-/etc/sysconfig/plasmalogin -Patch1001: plasmalogin-environment_file.patch -## Workaround for https://pagure.io/fedora-kde/SIG/issue/87 -Patch1002: plasmalogin-rpmostree-tmpfiles-hack.patch +## plasmalogin.service: +EnvironmentFile=-/etc/sysconfig/plasmalogin (FIXME: patch needs update for Sonic-DE source) +#Patch1001: plasmalogin-environment_file.patch +## Workaround for https://pagure.io/fedora-kde/SIG/issue/87 (FIXME: patch needs update for Sonic-DE source) +#Patch1002: plasmalogin-rpmostree-tmpfiles-hack.patch Provides: service(graphical-login) = plasmalogin @@ -94,13 +84,13 @@ Requires(pre): shadow-utils Requires: kde-settings-plasma -# Requires kwin-wayland -Requires: kwin-wayland%{?_isa} +# Requires sonic window manager (X11 variant) +Requires: sonic-win%{?_isa} Requires: (kcm-plasmalogin%{?_isa} if plasma-systemsettings%{?_isa}) %description -Plasma Login provides a display manager for KDE Plasma -and with an new frontend providing a greeter, +Sonic Login Manager provides a display manager for SonicDE +with a frontend providing a greeter, wallpaper plugin integration and a System Settings module (KCM). %package -n kcm-plasmalogin @@ -167,17 +157,17 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kcm_plasmalogin.desk %post %systemd_post plasmalogin.service -%systemd_user_post plasma-login.service plasma-login-kwin_wayland.service plasma-login-wayland.target plasma-wallpaper.service +%systemd_user_post plasma-login.service plasma-login-kwin_x11.service plasma-login-x11.target plasma-wallpaper.service %preun %systemd_preun plasmalogin.service -%systemd_user_preun plasma-login.service plasma-login-kwin_wayland.service plasma-login-wayland.target plasma-wallpaper.service +%systemd_user_preun plasma-login.service plasma-login-kwin_x11.service plasma-login-x11.target plasma-wallpaper.service %postun %systemd_postun plasmalogin.service -%systemd_user_postun plasma-login.service plasma-login-kwin_wayland.service plasma-login-wayland.target plasma-wallpaper.service +%systemd_user_postun plasma-login.service plasma-login-kwin_x11.service plasma-login-x11.target plasma-wallpaper.service %files -f plasma_login.lang @@ -193,7 +183,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kcm_plasmalogin.desk %{_prefix}/lib/pam.d/plasmalogin* %{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-plasmalogin.conf %{_bindir}/plasmalogin -%{_bindir}/startplasma-login-wayland +%{_bindir}/startplasma-login-x11 %{_bindir}/plasma-login-wallpaper %{_libexecdir}/plasmalogin-helper %{_libexecdir}/plasmalogin-helper-start-x11user @@ -204,8 +194,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kcm_plasmalogin.desk %attr(1770, plasmalogin, plasmalogin) %dir %{_localstatedir}/lib/plasmalogin %{_unitdir}/plasmalogin.service %{_userunitdir}/plasma-login.service -%{_userunitdir}/plasma-login-kwin_wayland.service -%{_userunitdir}/plasma-login-wayland.target +%{_userunitdir}/plasma-login-kwin_x11.service +%{_userunitdir}/plasma-login-x11.target %{_userunitdir}/plasma-wallpaper.service %dir %{_datadir}/plasmalogin %{_datadir}/plasmalogin/scripts/