#15 [DO NOT MERGE] Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration
Merged 2 years ago by ngompa. Opened 2 years ago by ngompa.
rpms/ ngompa/plasma-workspace rawhide-sddm-wayland  into  rawhide

file modified
+32 -1
@@ -5,12 +5,19 @@ 

  %global kf5_version_min 5.82.0

  

  # Control wayland by default

- %if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)

+ %if (0%{?rhel} && 0%{?rhel} < 9)

  %bcond_with wayland_default

  %else

  %bcond_without wayland_default

  %endif

  

+ # Control sddm wayland by default

+ %if (0%{?fedora} && 0%{?fedora} < 36) || (0%{?rhel} && 0%{?rhel} < 9)

+ %bcond_with sddm_wayland_default

+ %else

+ %bcond_without sddm_wayland_default

+ %endif

+ 

  # Control systemdBoot by default

  %if 0%{?rhel} && 0%{?rhel} < 9

  %bcond_with systemdBoot
@@ -395,6 +402,21 @@ 

  %description -n sddm-breeze

  %{summary}.

  

+ %package -n sddm-wayland-plasma

+ Summary:        Plasma Wayland SDDM greeter configuration

+ Provides:       sddm-greeter-displayserver

+ Conflicts:      sddm-greeter-displayserver

+ Requires:       kwin-wayland >= %{majmin_ver}

+ Requires:       maliit-keyboard

+ %if %{with sddm_wayland_default}

+ Supplements:    (sddm and plasma-workspace-wayland)

+ %endif

+ BuildArch:      noarch

+ 

+ %description -n sddm-wayland-plasma

+ This package contains configuration and dependencies for SDDM

+ to use KWin for the Wayland compositor for the greeter.

+ 

  %package wayland

  Summary:        Wayland support for Plasma

  Requires:       %{name} = %{version}-%{release}
@@ -468,6 +490,7 @@ 

  

  %build

  %{cmake_kf5} \

+   -DINSTALL_SDDM_WAYLAND_SESSION:BOOL=ON \

    %{?with_wayland_default:-DPLASMA_WAYLAND_DEFAULT_SESSION:BOOL=ON}

  

  %cmake_build
@@ -500,6 +523,10 @@ 

  install -m644 -p breeze-fedora/* \

          %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/

  

+ # move sddm configuration snippet to the right place

+ mkdir -p %{buildroot}%{_prefix}/lib/sddm

+ mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm

+ 

  %if 0%{?fedora} > 30

  ## customize plasma-lookandfeel-fedora defaults

  # from [Wallpaper] Image=Next to Image=Fedora
@@ -727,6 +754,9 @@ 

  %{_datadir}/sddm/themes/01-breeze-fedora/

  #%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user

  

+ %files -n sddm-wayland-plasma

+ %{_prefix}/lib/sddm/sddm.conf.d/plasma-wayland.conf

+ 

  %files wayland

  %{_kf5_bindir}/startplasma-wayland

  %if ! %{with wayland_default}
@@ -755,6 +785,7 @@ 

  %changelog

  * Thu Feb 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.24.0-1

  - 5.24.0

+ - Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration

  

  * Wed Jan 19 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.23.90-2

  - rebase konsole-in-contextmenu.patch (#2026789)

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 6b7cda8

2 years ago

rebased onto 6bd8c5b

2 years ago

Pull-Request has been merged by ngompa

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Metadata