Update to new snapshot

- Drop our sysusers and tmpfiles configuration for upstream versions

.gitignore

@@ -17,3 +17,4 @@
 /sddm-3e486499b9300ce8f9c62bd102e5119b27a2fad1.tar.gz
 /sddm-b042f69ff3ada1e5d94156450621db7a9246645a.tar.gz
 /sddm-3ee57e99836fe051c97e0f301962120466d220f7.tar.gz
+/sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz

sddm-0.20.0-fedora_config.patch

@@ -1,17 +1,18 @@
 diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index cdffde3..0272e2c 100644
+index 182f6a1..538243b 100644
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
-@@ -38,7 +38,7 @@ namespace SDDM {
+@@ -37,8 +37,7 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
  
          //  Name                   Type         Default value                                   Description
-         // TODO: Change default to x11-user in a future release
+-        // TODO: Change default to x11-user in a future release
 -        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
 +        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
                                                                                                     "Valid values are: x11, x11-user, wayland."));
          Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
          Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
-@@ -51,7 +51,7 @@ namespace SDDM {
+@@ -51,7 +50,7 @@ namespace SDDM {
          //  Name   Entries (but it's a regular class again)
          Section(Theme,
              Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
@@ -20,26 +21,25 @@ index cdffde3..0272e2c 100644
              Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
                                                                                                     "The files should be named <username>.face.icon"));
              Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
-@@ -71,10 +71,10 @@ namespace SDDM {
+@@ -71,9 +70,9 @@ namespace SDDM {
-             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Path to xauth binary"));
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
-             Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Directory containing available X sessions"));
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
              Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
--	    Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
-+	    Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
- 	    Entry(UserAuthFile,        QString,     _S(".Xauthority"),                          _S("Path to the Xauthority file"));
 -            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
 -            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
++            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
 +            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
 +            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
              Entry(EnableHiDPI,         bool,        false,                                      _S("Enable Qt's automatic high-DPI scaling"));
          );
  
-@@ -82,12 +82,12 @@ namespace SDDM {
+@@ -82,12 +81,12 @@ namespace SDDM {
-             Entry(CompositorCommand,   QString,     _S("weston --shell=fullscreen-shell.so"),   _S("Path of the Wayland compositor to execute when starting the greeter"));
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
-             Entry(SessionDir,          QString,     _S("/usr/share/wayland-sessions"),          _S("Directory containing available Wayland sessions"));
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
              Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
--	    Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
-+	    Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
++            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
              Entry(EnableHiDPI,         bool,        false,                                      _S("Enable Qt's automatic high-DPI scaling"));
          );
  

sddm-rpmostree-tmpfiles-hack.patch

@@ -0,0 +1,12 @@
+diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
+index fb45553..6acfb6c 100644
+--- a/services/sddm-tmpfiles.conf.in
++++ b/services/sddm-tmpfiles.conf.in
+@@ -1,5 +1,7 @@
+ # Home dir of the sddm user, also contains state.conf
+ d	${STATE_DIR}	0750	sddm	sddm
++# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
++Z	${STATE_DIR}	-	sddm	sddm
+ # This contains X11 auth files passed to Xorg and the greeter
+ d	${RUNTIME_DIR}	0711	root	root
+ # Sockets for IPC

sddm-systemd-sysusers.conf

@@ -1 +0,0 @@
-u sddm - "Simple Desktop Display Manager" /var/lib/sddm

sddm.spec

@@ -14,13 +14,13 @@
 %bcond_without sddm_wayland_default
 %endif
 
-%global commit 3ee57e99836fe051c97e0f301962120466d220f7
+%global commit 8f1e3df4768bd521034e02602c4410b06aaef7d5
-%global commitdate 20230201
+%global commitdate 20230214
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           sddm
 Version:        0.19.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        QML based desktop and login manager
 
@@ -47,22 +47,21 @@ Patch101:       sddm-0.20.0-fedora_config.patch
 # sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
 Patch103:       sddm-0.18.0-environment_file.patch
 
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Patch104:       sddm-rpmostree-tmpfiles-hack.patch
+
 # Shamelessly stolen from gdm
 Source11:       sddm.pam
 # Shamelessly stolen from gdm
 Source12:       sddm-autologin.pam
-# systemd tmpfiles support for /var/run/sddm
-Source13:       tmpfiles-sddm.conf
 # sample sddm.conf generated with sddm --example-config, and entries commented-out
-Source14: sddm.conf
+Source13: sddm.conf
 # README.scripts
-Source15: README.scripts
+Source14: README.scripts
 # sysconfig snippet
-Source16: sddm.sysconfig
+Source15: sddm.sysconfig
-# systemd sysusers config
-Source18:  sddm-systemd-sysusers.conf
 # sddm x11 override config
-Source19:  sddm-x11.conf
+Source16:  sddm-x11.conf
 
 
 Provides: service(graphical-login) = sddm
@@ -182,12 +181,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
 mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
 install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm
 install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
-install -Dpm 644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/sddm.conf
+install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
-install -Dpm 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
-install -Dpm 644 %{SOURCE15} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
+install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
-install -Dpm 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/sddm
+install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
-install -Dpm 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/sddm.conf
-install -Dpm 644 %{SOURCE19} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
 mkdir -p %{buildroot}/run/sddm
 mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
 mkdir -p %{buildroot}%{_sysconfdir}/sddm/
@@ -292,6 +289,10 @@ fi
 
 
 %changelog
+* Mon Feb 20 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20230214.8f1e3df-1
+- Update to new snapshot
+- Drop our sysusers and tmpfiles configuration for upstream versions
+
 * Wed Feb 01 2023 Marc Deop <marcdeop@fedoraproject.org> - 0.19.0^git20230201.3ee57e9-2
 - Update to new snapshot
 

sources

@@ -1 +1 @@
-SHA512 (sddm-3ee57e99836fe051c97e0f301962120466d220f7.tar.gz) = 2831dddbd741fb249765442bd0b17ca7657367ed32c8e5036da2704e62091d600fa1d4c261aec637bc34bd9f1cd07186b793bafbd84179497858bd77ef3e0226
+SHA512 (sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz) = 07b3435d1a5679fca48879aa1b6477bf285cddab98c9aa926b25b82f6f4134b2a6b0158de1aec8c3cc12201ce7486f2ab085449b9d949d55cb769ffa4309b04a

tmpfiles-sddm.conf

@@ -1,3 +0,0 @@
-d /run/sddm 1733 root root -
-# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
-Z /var/lib/sddm - sddm sddm - -