Accepting request 956820 from Base:System

- Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10)
  For a complete list of changes, visit:
  b9b83c5d11...0bb1977021

- Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb
  8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866)

- Fix build if %_distconfdir is not defined (see bsc#1195679)

OBS-URL: https://build.opensuse.org/request/show/956820
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=349

files.systemd

@@ -24,8 +24,8 @@
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %endif
-%dir %{_distconfdir}/X11/xinit
-%dir %{_distconfdir}/X11/xinit/xinitrc.d
+%dir %{xinitconfdir}
+%dir %{xinitconfdir}/xinitrc.d
 %dir %{_environmentdir}
 %dir %{_journalcatalogdir}
 %dir %{_localstatedir}/lib/systemd
@@ -205,7 +205,7 @@
 %{_datadir}/zsh/site-functions/_systemd-tmpfiles
 %{_datadir}/zsh/site-functions/_timedatectl
 %endif
-%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
+%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
 %{_environmentdir}/99-environment.conf
 %{_journalcatalogdir}/systemd.be.catalog
 %{_journalcatalogdir}/systemd.be@latin.catalog

systemd-v249.10+suse.86.g0bb1977021.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812
+size 7281992

systemd-v249.9+suse.82.g117bd7f14a.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0
-size 7280500

systemd.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Feb 22 15:22:16 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/b9b83c5d11e686178ddd545862a00b33c6fdfabb...0bb1977021be2fc9ebfae10d766dff0b1a457f88
+
+-------------------------------------------------------------------
+Tue Feb 22 14:50:50 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb
+
+  8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866)
+
+-------------------------------------------------------------------
+Mon Feb 21 09:56:26 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Fix build if %_distconfdir is not defined (see bsc#1195679)
+
 -------------------------------------------------------------------
 Thu Feb 17 18:30:12 UTC 2022 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -27,8 +27,9 @@
 %endif
 
 %define min_kernel_version 4.5
-%define suse_version +suse.82.g117bd7f14a
+%define suse_version +suse.86.g0bb1977021
 %define _testsuitedir /usr/lib/systemd/tests
+%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
 
 # Similar to %%with but returns true/false. The 'true' value can be redefined
 # when a second parameter is passed.
@@ -70,7 +71,7 @@
 
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        249.9
+Version:        249.10
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
@@ -653,7 +654,7 @@ Have fun with these services at your own risk.
         -Dldconfig=false \
         -Dpamconfdir=no \
         -Dpamlibdir=%{_pam_moduledir} \
-        -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \
+        -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
 %if %{without sysvcompat}