up to 246.4

[packages/systemd.git] / systemd.spec
diff --git a/systemd.spec b/systemd.spec

index b4221f5cb3c366e2fb4e7bca0f9145d904241b6d..1b9842299960c4043104dd1e21b6b7d3989724ab 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -7,47 +7,54 @@
  # - dev->udev upgrade:
  #   - /dev/urandom remains missing, not created with start_udev anymore
  #
+#warning: Installed (but unpackaged) file(s) found:
+#      /usr/lib/rpm/macros.d/macros.systemd
+#
  # Conditional build:
-%bcond_without audit           # without audit support
-%bcond_without cryptsetup      # without cryptsetup support
+%bcond_without audit           # audit support
+%bcond_without cryptsetup      # cryptsetup support
  %bcond_without microhttpd      # use microhttpd for network journal access
  %bcond_without pam             # PAM authentication support
  %bcond_without qrencode        # QRencode support
-%bcond_without selinux         # without SELinux support
-%bcond_without tcpd            # libwrap (tcp_wrappers) support
-%bcond_with    efi             # EFI boot support [missing files in 220]
+%bcond_without selinux         # SELinux support
+%bcond_without efi             # EFI boot support
  %bcond_with    tests           # "make check" (requires systemd already installed)
  
+%ifnarch %{ix86} %{x8664} aarch64
+# x32 disabled - maybe it's possible to build x64 EFI, but it requires some hacking (add -m64 to EFI gcc command line?)
+%undefine      with_efi
+%endif
  Summary:       A System and Service Manager
  Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
  Name:          systemd
  # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       220
-Release:       0.3
+Version:       246.4
+Release:       1
  Epoch:         1
  License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
  Group:         Base
-Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 60acd92b04c0f5faa806678abd433014
+#Source0Download: https://github.com/systemd/systemd/releases
+Source0:       https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 4e6d938bf5715e92c772bca7d5a6fa28
  Source1:       %{name}-sysv-convert
  Source2:       %{name}_booted.c
  Source3:       network.service
  Source4:       var-lock.mount
  Source5:       var-run.mount
-Source10:      pld-storage-init-late.service
-Source11:      pld-storage-init.service
-Source12:      pld-wait-storage.service
-Source13:      pld-storage-init.sh
  Source14:      pld-clean-tmp.service
  Source15:      pld-clean-tmp.sh
  Source16:      pld-rc-inetd-generator.sh
  Source17:      rc-inetd.service
  Source18:      default.preset
  Source19:      prefdm.service
+Source20:      sigpwr-container-shutdown.service
+
  # rules
  Source101:     udev-alsa.rules
  Source102:     udev.rules
  Source103:     udev-links.conf
+Source104:     udev-uinput.rules
+Source105:     udev-steam_controller.rules
  # scripts / helpers
  Source110:     udev-net.helper
  Source111:     start_udev
@@ -59,65 +66,73 @@ Patch1:             config-pld.patch
  Patch2:                pld-sysv-network.patch
  Patch3:                tmpfiles-not-fatal.patch
  Patch4:                udev-ploop-rules.patch
-Patch5:                udevadm-in-sbin.patch
+
  Patch6:                net-rename-revert.patch
-Patch7:                nss-in-rootlib.patch
+Patch7:                %{name}-completion.patch
  Patch8:                proc-hidepid.patch
-Patch9:                systemd-configfs.patch
+Patch9:                %{name}-configfs.patch
  Patch10:       pld-boot_efi_mount.patch
  Patch11:       optional-tmp-on-tmpfs.patch
  Patch12:       uids_gids.patch
-Patch13:       root-lib.patch
-URL:           http://www.freedesktop.org/wiki/Software/systemd
+Patch13:       sysctl.patch
+Patch14:       pld-pam-%{name}-user.patch
+Patch15:       %{name}-x32.patch
+URL:           https://www.freedesktop.org/wiki/Software/systemd/
  BuildRequires: acl-devel
-BuildRequires: attr-devel
  %{?with_audit:BuildRequires:   audit-libs-devel}
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11
  BuildRequires: binutils >= 3:2.22.52.0.1-2
-%{?with_cryptsetup:BuildRequires:      cryptsetup-devel >= 1.6.0}
-BuildRequires: dbus-devel >= 1.3.2
+BuildRequires: bzip2-devel
+# ln --relative
+BuildRequires: coreutils >= 8.16
+%{?with_cryptsetup:BuildRequires:      cryptsetup-devel >= 2.3.0}
+BuildRequires: curl-devel >= 7.32.0
+BuildRequires: dbus-devel >= 1.9.18
+BuildRequires: docbook-dtd42-xml
  BuildRequires: docbook-dtd45-xml
-BuildRequires: docbook-style-xsl
-BuildRequires: elfutils-devel
+BuildRequires: docbook-style-xsl-nons
+BuildRequires: elfutils-devel >= 0.158
  BuildRequires: gettext-tools
  BuildRequires: glib2-devel >= 1:2.22.0
  BuildRequires: glibc-misc
  %{?with_efi:BuildRequires:     gnu-efi}
  BuildRequires: gnutls-devel >= 3.1.4
-BuildRequires: gobject-introspection-devel >= 1.31.1
  BuildRequires: gperf
-BuildRequires: gtk-doc >= 1.18
  BuildRequires: intltool >= 0.40.0
-BuildRequires: kmod-devel >= 14
-BuildRequires: libapparmor-devel
-BuildRequires: libblkid-devel >= 2.20
+# pkgconfig(libiptc)
+BuildRequires: iptables-devel
+BuildRequires: kmod-devel >= 15
+BuildRequires: libapparmor-devel >= 1:2.13
+BuildRequires: libblkid-devel >= 2.24
  BuildRequires: libcap-devel
  BuildRequires: libgcrypt-devel >= 1.4.5
+BuildRequires: libgpg-error-devel >= 1.12
+BuildRequires: libidn2-devel
  %{?with_microhttpd:BuildRequires:      libmicrohttpd-devel >= 0.9.33}
-BuildRequires: libmount-devel
-BuildRequires: libseccomp-devel >= 1.0.0
-%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
+BuildRequires: libmount-devel >= 2.30
+BuildRequires: libseccomp-devel >= 2.4.0
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
  BuildRequires: libtool >= 2:2.2
-%{?with_tcpd:BuildRequires:    libwrap-devel}
  BuildRequires: libxslt-progs
-BuildRequires: lz4-devel
+BuildRequires: lz4-devel >= 1:1.3.0
  BuildRequires: m4
-%{?with_pam:BuildRequires:     pam-devel}
+BuildRequires: meson >= 0.46
+BuildRequires: ninja
+%{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
+BuildRequires: pcre2-8-devel
  BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: python-devel
-BuildRequires: python-lxml
-BuildRequires: python-modules
+BuildRequires: polkit-devel >= 0.106
+BuildRequires: python3
+BuildRequires: python3-lxml
  %{?with_qrencode:BuildRequires:        qrencode-devel}
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.628
+BuildRequires: rpmbuild(macros) >= 1.728
  BuildRequires: sed >= 4.0
  %{?with_tests:BuildRequires:   systemd}
  BuildRequires: usbutils >= 0.82
+BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0
  BuildRequires: xz-devel
  BuildRequires: zlib-devel
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      %{name}-units = %{epoch}:%{version}-%{release}
+BuildRequires: zstd-devel >= 1.4.0
+Requires(post,postun): %{name}-units = %{epoch}:%{version}-%{release}
  Requires(postun):      /usr/sbin/groupdel
  Requires(postun):      /usr/sbin/userdel
  Requires(post):        /bin/setfacl
@@ -125,41 +140,56 @@ Requires(pre):    /bin/id
  Requires(pre): /usr/bin/getgid
  Requires(pre): /usr/sbin/groupadd
  Requires(pre): /usr/sbin/useradd
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-units = %{epoch}:%{version}-%{release}
+Requires:      %{name}-tools = %{epoch}:%{version}-%{release}
  Requires:      /etc/os-release
  Requires:      SysVinit-tools
  Requires:      agetty
-%{?with_cryptsetup:Requires:   cryptsetup >= 1.6.0}
-Requires:      dbus >= 1.4.16-6
+%{?with_cryptsetup:Requires:   cryptsetup >= 2.3.0}
+Requires:      curl-libs >= 7.32.0
+Requires:      dbus >= 1.9.18
  Requires:      filesystem >= 4.0-39
-Requires:      kmod >= 14
+Requires:      glibc >= 2.16
+Requires:      gnutls-libs >= 3.1.4
+Requires:      kmod >= 25-2
+Requires:      libgpg-error >= 1.12
  %{?with_microhttpd:Requires:   libmicrohttpd >= 0.9.33}
  Requires:      libutempter
-Requires:      polkit
+Requires:      polkit >= 0.106
  Requires:      rc-scripts >= 0.4.5.3-7
  Requires:      setup >= 2.8.0-2
  Requires:      udev-core = %{epoch}:%{version}-%{release}
  Requires:      udev-libs = %{epoch}:%{version}-%{release}
-Requires:      uname(release) >= 3.7
-Suggests:      ConsoleKit
+Requires:      uname(release) >= 3.13
+Requires:      util-linux >= 2.30
  Suggests:      fsck >= 2.25.0
  Suggests:      service(klogd)
  Suggests:      service(syslog)
-Provides:      group(systemd-bus-proxy)
-Provides:      group(systemd-network)
-Provides:      group(systemd-resolve)
-Provides:      group(systemd-timesync)
+Suggests:      xorg-lib-libxkbcommon >= 0.5.0
+Provides:      group(systemd-coredump)
  Provides:      group(systemd-journal)
  Provides:      group(systemd-journal-remote)
  Provides:      group(systemd-journal-upload)
-Provides:      user(systemd-bus-proxy)
+Provides:      group(systemd-network)
+Provides:      group(systemd-resolve)
+Provides:      group(systemd-timesync)
+Provides:      udev-acl = %{epoch}:%{version}-%{release}
+Provides:      user(systemd-coredump)
+Provides:      user(systemd-journal-remote)
+Provides:      user(systemd-journal-upload)
  Provides:      user(systemd-network)
  Provides:      user(systemd-resolve)
  Provides:      user(systemd-timesync)
-Provides:      user(systemd-journal-remote)
-Provides:      user(systemd-journal-upload)
-Provides:      udev-acl = %{epoch}:%{version}-%{release}
+# kde4 still can't live without ConsoleKit
+#Obsoletes:    ConsoleKit
+#Obsoletes:    ConsoleKit-x11
+Obsoletes:     elogind
  Obsoletes:     systemd-no-compat-tmpfiles
  Obsoletes:     udev-systemd
+# for storage detection / activation services
+Conflicts:     dmraid < 1.0.0-0.rc16.3.3
+Conflicts:     mdadm < 4.0-2
  # sytemd wants pam with pam_systemd.so in system-auth...
  Conflicts:     pam < 1:1.1.5-5
  # ...and sudo hates it
@@ -167,8 +197,8 @@ Conflicts:  sudo < 1:1.7.8p2-4
  # for prefdm script
  Conflicts:     xinitrc-ng < 1.0
  # systemd scripts use options not present in older versions
-Conflicts:     kpartx < 0.4.9-7
-Conflicts:     multipath-tools < 0.4.9-7
+Conflicts:     kpartx < 0.6.1-1
+Conflicts:     multipath-tools < 0.6.1-1
  # no tmpfs on /media, use /run/media/$USER for mounting
  Conflicts:     udisks2 < 1.92.0
  # packages that have dirs under /var/run and/or /var/lock must provide tmpfiles configs
@@ -206,6 +236,8 @@ Conflicts:  libgpod < 0.8.0-6
  Conflicts:     libvirt-utils < 0.9.9-4
  Conflicts:     lighttpd < 1.4.30-5
  Conflicts:     lirc < 0.9.0-20
+# Needed for vgscan --cache ( perhaps < 2.02.96 would be enough, but not tested)
+Conflicts:     lvm2 < 2.02.132
  Conflicts:     mailman < 5:2.1.14-4
  Conflicts:     memcached < 1.4.11-2
  Conflicts:     mpd < 0.16.5-4
@@ -253,8 +285,7 @@ Conflicts:  xl2tpd < 1.3.0-2
  # end of tmpfiles conflicts
  BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
-%define                _sbindir        /sbin
-%define                _libexecdir     %{_prefix}/lib
+%define                _rootsbindir    /sbin
  
  %description
  systemd is a system and service manager for Linux, compatible with
@@ -291,6 +322,8 @@ Conflicts:  rc-scripts < 0.4.5.5-2
  Conflicts:     upstart
  # systemd takes care of that and causes problems
  Conflicts:     binfmt-detector
+# for /lib/systemd/systemd-sysv-install
+Conflicts:     chkconfig < 2:1.5-1
  
  %description init
  Install this package when you are ready to final switch to systemd.
@@ -319,6 +352,18 @@ zarządcy systemu i usług systemd.
  Ten pakiet zawiera ogólną konfigurację, ustawienia można nadpisać
  poprzez katalog %{_sysconfdir}/systemd/system.
  
+%package tools
+Summary:       Tools that work with and without systemd started
+Summary(pl.UTF-8):     Narzędzia działające przy uruchomionym jak i bez systemd
+Group:         Base
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description tools
+Tools that work with and without systemd started.
+
+%description tools -l pl.UTF-8
+Narzędzia działające przy uruchomionym jak i bez systemd.
+
  %package journal-gateway
  Summary:       Gateway for serving journal events over the network using HTTP
  Summary(pl.UTF-8):     Bramka do serwowania zdarzeń dziennika po sieci poprzez HTTP
@@ -356,10 +401,24 @@ and configures network devices as they appear, as well as creating
  virtual network devices.
  
  %description networkd -l pl.UTF-8
-systemd-networkd to usługa systemowa zarządzająca siecią. Wykrywa
-i konfiguruje interfejsy sieciowe gdy się pojawiają, a także tworzy
+systemd-networkd to usługa systemowa zarządzająca siecią. Wykrywa i
+konfiguruje interfejsy sieciowe gdy się pojawiają, a także tworzy
  wirtualne urządzenia sieciowe.
  
+%package portabled
+Summary:       systemd portable service images service
+Summary(pl.UTF-8):     Usługa systemd do obrazów usług przenośnych
+Group:         Base
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description portabled
+systemd-portabled is a system service that may be used to attach,
+detach and inspect portable service images.
+
+%description portabled -l pl.UTF-8
+systemd-portabled to usługa systemowa służąca do podłączania,
+odłączania i badania obrazów usług przenośnych.
+
  %package resolved
  Summary:       systemd network name resolution manager
  Summary(pl.UTF-8):     Zarządca rozwiązywania nazw sieciowych systemd
@@ -413,9 +472,6 @@ Summary:    Tool for processing systemd profiling information
  Summary(pl.UTF-8):     Narzędzie do przetwarzania informacji profilujących systemd
  Group:         Base
  Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      python-dbus
-Requires:      python-modules
-Suggests:      python-pycairo
  Conflicts:     systemd < 44-3
  
  %description analyze
@@ -434,7 +490,10 @@ Summary:   Shared systemd libraries
  Summary(pl.UTF-8):     Biblioteki współdzielone systemd
  Group:         Libraries
  Requires:      libgcrypt >= 1.4.5
-%{?with_selinux:Requires:      libselinux >= 2.1.9}
+Requires:      libseccomp >= 2.4.0
+%{?with_selinux:Requires:      libselinux >= 2.6}
+Requires:      lz4-libs >= 1:1.3.0
+Requires:      zstd >= 1.4.0
  Obsoletes:     nss_myhostname
  
  %description libs
@@ -448,6 +507,7 @@ Summary:    Header files for systemd libraries
  Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek systemd
  Group:         Development/Libraries
  Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-units = %{epoch}:%{version}-%{release}
  Obsoletes:     systemd-static
  
  %description devel
@@ -456,25 +516,13 @@ Header files for systemd libraries.
  %description devel -l pl.UTF-8
  Pliki nagłówkowe bibliotek systemd.
  
-%package -n python-systemd
-Summary:       Systemd Python bindings
-Summary(pl.UTF-8):     Wiązania do Systemd dla Pythona
-Group:         Development/Languages/Python
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      python
-
-%description -n python-systemd
-Systemd Python bindings.
-
-%description -n python-systemd -l pl.UTF-8
-Wiązania do Systemd dla Pythona.
-
  %package -n bash-completion-systemd
  Summary:       bash-completion for systemd
  Summary(pl.UTF-8):     Bashowe dopełnianie składni dla systemd
  Group:         Applications/Shells
  Requires:      %{name} = %{epoch}:%{version}-%{release}
  Requires:      bash-completion >= 2.0
+Obsoletes:     bash-completion-elogind
  %if "%{_rpmversion}" >= "5"
  BuildArch:     noarch
  %endif
@@ -490,6 +538,7 @@ Summary:    zsh completion for systemd commands
  Summary(pl.UTF-8):     Uzupełnianie parametrów w zsh dla poleceń systemd
  Group:         Applications/Shells
  Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     zsh-completion-elogind
  %if "%{_rpmversion}" >= "5"
  BuildArch:     noarch
  %endif
@@ -531,13 +580,13 @@ Summary(pl.UTF-8):        Implementacja devfs w przestrzeni użytkownika - główna cz
  Group:         Base
  Requires:      coreutils
  Requires:      filesystem >= 3.0-45
-Requires:      kmod >= 14
-Requires:      libblkid >= 2.20
-%{?with_selinux:Requires:      libselinux >= 2.1.9}
+Requires:      kmod >= 15
+Requires:      libblkid >= 2.24
+%{?with_selinux:Requires:      libselinux >= 2.6}
  Requires:      setup >= 2.9.0-3
+Requires:      systemd-libs = %{epoch}:%{version}-%{release}
  Requires:      udev-libs = %{epoch}:%{version}-%{release}
-Requires:      uname(release) >= 2.6.32
-#Suggests:     uname(release) >= 3.7
+Requires:      uname(release) >= 3.13
  Obsoletes:     udev-compat
  Obsoletes:     udev-initrd < %{epoch}:%{version}-%{release}}
  Conflicts:     geninitrd < 12639
@@ -568,6 +617,7 @@ Summary:    Header file for libudev library
  Summary(pl.UTF-8):     Plik nagłówkowy biblioteki libudev
  Group:         Development/Libraries
  Requires:      udev-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     udev-apidocs
  Obsoletes:     udev-static
  
  %description -n udev-devel
@@ -576,64 +626,6 @@ Header file for libudev library.
  %description -n udev-devel -l pl.UTF-8
  Plik nagłówkowy biblioteki libudev.
  
-%package -n udev-apidocs
-Summary:       libudev API documentation
-Summary(pl.UTF-8):     Dokumentacja API libudev
-Group:         Documentation
-Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description -n udev-apidocs
-libudev API documentation.
-
-%description -n udev-apidocs -l pl.UTF-8
-Dokumentacja API libudev.
-
-%package -n udev-glib
-Summary:       Shared libgudev library - GObject bindings for libudev
-Summary(pl.UTF-8):     Biblioteka współdzielona libgudev - wiązania GObject do libudev
-Group:         Libraries
-Requires:      glib2 >= 1:2.22.0
-Requires:      udev-libs = %{epoch}:%{version}-%{release}
-
-%description -n udev-glib
-Shared libgudev library - GObject bindings for libudev.
-
-%description -n udev-glib -l pl.UTF-8
-Biblioteka współdzielona libgudev - wiązania GObject do libudev.
-
-%package -n udev-glib-devel
-Summary:       Header file for libgudev library
-Summary(pl.UTF-8):     Plik nagłówkowy biblioteki libgudev
-Group:         Development/Libraries
-Requires:      glib2-devel >= 1:2.22.0
-Requires:      udev-devel = %{epoch}:%{version}-%{release}
-Requires:      udev-glib = %{epoch}:%{version}-%{release}
-Obsoletes:     udev-glib-static
-
-%description -n udev-glib-devel
-Header file for libgudev library.
-
-%description -n udev-glib-devel -l pl.UTF-8
-Plik nagłówkowy biblioteki libgudev.
-
-%package -n udev-glib-apidocs
-Summary:       libgudev API documentation
-Summary(pl.UTF-8):     Dokumentacja API libgudev
-Group:         Documentation
-Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description -n udev-glib-apidocs
-libgudev API documentation.
-
-%description -n udev-glib-apidocs -l pl.UTF-8
-Dokumentacja API libgudev.
-
  %package -n bash-completion-udev
  Summary:       bash-completion for udev
  Summary(pl.UTF-8):     Bashowe dopełnianie składni dla udev
@@ -666,13 +658,13 @@ zsh completion for udev commands.
  Uzupełnianie parametrów w zsh dla poleceń udev.
  
  %prep
-%setup -q
+%setup -q -n systemd-stable-%{version}
  %patch0 -p1
  %patch1 -p1
  %patch2 -p1
  %patch3 -p1
  %patch4 -p1
-%patch5 -p1
+
  # rejected upstream (do not disable!)
  %patch6 -p1
  %patch7 -p1
@@ -682,91 +674,103 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
  %patch11 -p1
  %patch12 -p1
  %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
  cp -p %{SOURCE2} src/systemd_booted.c
  
-# this file is autogenerated
-%{__rm} src/udev/keyboard-keys-from-name.gperf
+grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash,#!/bin/bash,g'
  
  %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       QUOTAON=/sbin/quotaon \
-       QUOTACHECK=/sbin/quotacheck \
-       SETCAP=/sbin/setcap \
-       KILL=/bin/kill \
-       KMOD=/sbin/kmod \
-       KEXEC=/sbin/kexec \
-       %{?debug:--enable-debug} \
-       %{__enable_disable audit} \
-       %{__enable_disable cryptsetup libcryptsetup} \
-       %{__enable_disable efi gnuefi} \
-       %{__enable_disable pam} \
-       %{__enable_disable selinux} \
-       %{__enable_disable tcpd tcpwrap} \
-       %{__enable_disable microhttpd} \
-       %{__enable_disable qrencode} \
-       --disable-silent-rules \
-       --enable-chkconfig \
-       --enable-compat-libs \
-       --enable-gtk-doc \
-       --enable-introspection \
-       --enable-split-usr \
-       --enable-lz4 \
-       --with-html-dir=%{_gtkdocdir} \
-       --with-kbd-loadkeys=/usr/bin/loadkeys \
-       --with-kbd-setfont=/bin/setfont \
-       --with-sysvinit-path=/etc/rc.d/init.d \
-       --with-sysvrcnd-path=/etc/rc.d \
-       --with-firmware-path=/lib/firmware \
-       --with-rc-local-script-path-start=/etc/rc.d/rc.local \
-       --with-rc-local-script-path-stop=/sbin/halt.local \
-       --with-rootprefix="" \
-       --with-rootlibdir=/%{_lib}
-
-%{__make}
-./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
-
-%{?with_tests:%{__make} check}
+%meson build \
+       -Daudit=%{__true_false audit} \
+       -Ddefault-hierarchy=hybrid \
+       -Ddefault-kill-user-processes=false \
+       %{?debug:--buildtype=debug} \
+       -Defi=%{__true_false efi} \
+       -Dkexec-path=/sbin/kexec \
+       -Dkmod-path=/sbin/kmod \
+       -Dlibcryptsetup=%{__true_false cryptsetup} \
+       -Dlibidn2=true \
+       -Dloadkeys-path=/usr/bin/loadkeys \
+       -Dlz4=true \
+       -Dman=true \
+       -Dmicrohttpd=%{__true_false microhttpd} \
+       -Dmount-path=/bin/mount \
+       -Dnobody-user="nobody" \
+       -Dnobody-group="nogroup" \
+       -Dntp-servers='0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org' \
+       -Dpam=%{__true_false pam} \
+       -Dqrencode=%{__true_false qrencode} \
+       -Dquotacheck=true \
+       -Dquotacheck-path=/sbin/quotacheck \
+       -Dquotaon-path=/sbin/quotaon \
+       -Drc-local=/etc/rc.d/rc.local \
+       -Drootlibdir=/%{_lib} \
+       -Drootprefix="" \
+       -Dselinux=%{__true_false selinux} \
+       -Dsetfont-path=/bin/setfont \
+       -Dsplit-bin=true \
+       -Dsplit-usr=true \
+       -Dsulogin-path=/sbin/sulogin \
+       -Dsysvinit-path=/etc/rc.d/init.d \
+       -Dsysvrcnd-path=/etc/rc.d \
+       -Dumount-path=/bin/umount \
+       -Dusers-gid=1000 \
+
+%meson_build -C build
+
+%{__cc} %{rpmcppflags} %{rpmcflags} -o build/systemd_booted %{rpmldflags} src/systemd_booted.c -Lbuild -lsystemd
+
+%{?with_tests:%meson_test -C build}
  
  %install
  rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/lib/{%{name}/coredump,machines} \
-       $RPM_BUILD_ROOT{%{_sysconfdir}/{modprobe.d,systemd/system-preset},%{_sbindir}}
+install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
+       $RPM_BUILD_ROOT%{_rootsbindir} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,systemd/system-preset} \
+       $RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants \
+       $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants \
+       $RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \
+       $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-environment-generators
+
+%meson_install -C build
  
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+touch $RPM_BUILD_ROOT/var/lib/%{name}/random-seed
  
-./libtool --mode=install install -p -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
+install -p -m755 build/systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
+
+# target-pld.patch supplements
+rm $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/sys-kernel-config.mount
+ln -s %{systemdunitdir}/prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/graphical.target.wants/display-manager.service
+ln -s prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/display-manager.service
+ln -s rescue.service $RPM_BUILD_ROOT%{systemdunitdir}/single.service
+ln -s %{systemdunitdir}/rc-local.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/rc-local.service
  
  # compatibility symlinks to udevd binary
  mv $RPM_BUILD_ROOT/lib/{systemd/systemd-,udev/}udevd
  ln -s /lib/udev/udevd $RPM_BUILD_ROOT/lib/systemd/systemd-udevd
-ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/udevd
+ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_rootsbindir}/udevd
  
  # compat symlinks for "/ merged into /usr" programs
-mv $RPM_BUILD_ROOT/{,s}bin/udevadm
-ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT/bin
-ln -s /lib/udev $RPM_BUILD_ROOT/usr/lib/
+ln -s ../bin/udevadm $RPM_BUILD_ROOT%{_rootsbindir}
+ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib
  
  # install custom udev rules from pld package
  cp -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
  cp -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
+cp -a %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-uinput.rules
+cp -a %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-steam_controller.rules
  
-# disable this abomination
  # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
-ln -s /dev/null $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
+ln -s /dev/null $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
  
  # install udev configs
  cp -a %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
  
  # install udev executables (scripts, helpers, etc.)
  install -p %{SOURCE110} $RPM_BUILD_ROOT/lib/udev/net_helper
-install -p %{SOURCE111} $RPM_BUILD_ROOT%{_sbindir}/start_udev
+install -p %{SOURCE111} $RPM_BUILD_ROOT%{_rootsbindir}/start_udev
  
  # install misc udev stuff
  cp -a %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
@@ -774,23 +778,12 @@ cp -a %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/fbdev-blacklist.conf
  
  :>$RPM_BUILD_ROOT%{_sysconfdir}/udev/hwdb.bin
  
-mv $RPM_BUILD_ROOT%{_mandir}/man8/{systemd-,}udevd.8
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man8/{systemd-,}udevd.8
  echo ".so man8/udevd.8" >$RPM_BUILD_ROOT%{_mandir}/man8/systemd-udevd.8
  
  # Main binary has been moved, but we don't want to break existing installs
  ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/bin/systemd
  
-# Create SysV compatibility symlinks. systemctl/systemd are smart
-# enough to detect the way they were called
-install -d $RPM_BUILD_ROOT/sbin
-ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/sbin/init
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
-
  ln -s ../modules $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/modules.conf
  
  # disable redundant SYSV services
@@ -814,18 +807,16 @@ ln -s ../var-run.mount $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
  # and remove mounting tmp on tmpfs by default
  %{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants/tmp.mount
  
-# Install and enable storage subsystems support services (RAID, LVM, etc.)
-cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
-cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
-cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/pld-wait-storage.service
+# add /tmp cleanup service
  cp -p %{SOURCE14} $RPM_BUILD_ROOT%{systemdunitdir}/pld-clean-tmp.service
-install -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-storage-init
  install -p %{SOURCE15} $RPM_BUILD_ROOT/lib/systemd/pld-clean-tmp
-
-ln -s ../pld-storage-init-late.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
-ln -s ../pld-storage-init.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
  ln -s ../pld-clean-tmp.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
  
+# Add inside container only SIGPWR handler which is used by lxc-stop
+install -p %{SOURCE20} $RPM_BUILD_ROOT%{systemdunitdir}/sigpwr-container-shutdown.service
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/sigpwr.target.wants
+ln -s ../sigpwr-container-shutdown.service $RPM_BUILD_ROOT%{systemdunitdir}/sigpwr.target.wants
+
  # As of 207 the systemd-sysctl tool no longer natively reads the file /etc/sysctl.conf.
  # If desired, the file should be symlinked from /etc/sysctl.d/99-sysctl.conf.
  ln -s /etc/sysctl.conf $RPM_BUILD_ROOT/etc/sysctl.d/99-sysctl.conf
@@ -839,7 +830,8 @@ cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system-preset/default.pr
  cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/prefdm.service
  
  # handled by rc-local sysv service, no need for generator
-%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}-generators/systemd-rc-local-generator
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}-generators/systemd-rc-local-generator \
+       $RPM_BUILD_ROOT%{_mandir}/man8/systemd-rc-local-generator.8
  
  # provided by rc-scripts
  %{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
@@ -851,10 +843,10 @@ cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/prefdm.service
  install -d $RPM_BUILD_ROOT%{systemdunitdir}/{basic,dbus,halt,initrd,kexec,poweroff,reboot,shutdown,syslog}.target.wants
  
  # Make sure the shutdown/sleep drop-in dirs exist
-install -d $RPM_BUILD_ROOT%{_libexecdir}/systemd/system-{shutdown,sleep}
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-{shutdown,sleep}
  
  # Create new-style configuration files so that we can ghost-own them
-touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,timezone,vconsole.conf}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,vconsole.conf}
  
  # Install SysV conversion tool for systemd
  install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
@@ -862,21 +854,11 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
  # Create directory for service helper scripts
  install -d $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d
  
-# to be enabled only when the packages are installed
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-networkd.service
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-networkd.socket
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-resolved.service
-
  install -d $RPM_BUILD_ROOT/var/log
  :> $RPM_BUILD_ROOT/var/log/btmp
  :> $RPM_BUILD_ROOT/var/log/wtmp
  
  %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/libnss_myhostname.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/systemd/*.la
-%py_postclean
  
  %find_lang %{name}
  
@@ -885,8 +867,6 @@ rm -rf $RPM_BUILD_ROOT
  
  %pre
  %groupadd -g 288 systemd-journal
-%groupadd -g 315 systemd-bus-proxy
-%useradd -u 315 -g 315 -d /var/log/journal -s /bin/false -c "Systemd Bus Proxy" systemd-bus-proxy
  %groupadd -g 316 systemd-network
  %useradd -u 316 -g 316 -d /var/log/journal -s /bin/false -c "Systemd Network Management" systemd-network
  %groupadd -g 317 systemd-resolve
@@ -897,12 +877,15 @@ rm -rf $RPM_BUILD_ROOT
  %useradd -u 319 -g 319 -d /var/log/journal -s /bin/false -c "Systemd Journal Remote" systemd-journal-remote
  %groupadd -g 320 systemd-journal-upload
  %useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
+%groupadd -g 333 systemd-coredump
+%useradd -u 333 -g 333 -d /var/log/journal -s /bin/false -c "Systemd Core Dumper" systemd-coredump
  
  %post
  /bin/systemd-machine-id-setup || :
  /lib/systemd/systemd-random-seed save || :
  /bin/systemctl --system daemon-reexec || :
  /bin/journalctl --update-catalog || :
+/bin/systemd-sysusers || :
  
  %postun
  if [ $1 -ge 1 ]; then
@@ -910,6 +893,18 @@ if [ $1 -ge 1 ]; then
         /bin/systemctl try-restart systemd-logind.service || :
  fi
  if [ "$1" = "0" ]; then
+       %userremove systemd-coredump
+       %groupremove systemd-coredump
+       %userremove systemd-network
+       %groupremove systemd-network
+       %userremove systemd-resolve
+       %groupremove systemd-resolve
+       %userremove systemd-timesync
+       %groupremove systemd-timesync
+       %userremove systemd-journal-remote
+       %groupremove systemd-journal-remote
+       %userremove systemd-journal-upload
+       %groupremove systemd-journal-upload
         %groupremove systemd-journal
  fi
  
@@ -921,8 +916,14 @@ chmod g+s /var/log/journal
  # https://bugs.freedesktop.org/show_bug.cgi?id=89202
  /bin/getfacl -p /var/log/journal/$(cat /etc/machine-id) | grep -v '^#' | sort -u | /bin/setfacl -R --set-file=- /var/log/journal/$(cat /etc/machine-id) || :
  
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%triggerpostun -- systemd-consoled < 1:232-1
+if [ -f %{_sysconfdir}/vconsole.conf.rpmsave ]; then
+       %{__mv} -f %{_sysconfdir}/vconsole.conf %{_sysconfdir}/vconsole.conf.rpmnew
+       %{__mv} -f %{_sysconfdir}/vconsole.conf.rpmsave %{_sysconfdir}/vconsole.conf
+fi
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
  
  %post units
  if [ $1 -eq 1 ]; then
@@ -1007,6 +1008,11 @@ if [ -L /etc/systemd/system/getty.target.wants/getty@.service ] ; then
         rm -f /etc/systemd/system/getty.target.wants/getty@.service || :
  fi
  
+%triggerpostun units -- systemd-units < 1:242
+if [ -L /var/lib/systemd/timesync ] ; then
+       rm -f /var/lib/systemd/timesync || :
+fi
+
  %post inetd
  %systemd_reload
  # Do not change it to restart, we only want to start new services here
@@ -1067,14 +1073,14 @@ fi
  %endif
  
  %triggerpostun -n udev-core -- udev < 165
-/sbin/udevadm info --convert-db
+/bin/udevadm info --convert-db
  
  %post -n udev-core
-/sbin/udevadm hwdb --update || :
+/bin/udevadm hwdb --update || :
  if [ $1 -gt 1 ]; then
         if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
                 if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then
-                       /sbin/udevadm control --exit
+                       /bin/udevadm control --exit
                         /lib/udev/udevd --daemon
                 fi
         else
@@ -1092,26 +1098,25 @@ fi
  %post  -n udev-libs -p /sbin/ldconfig
  %postun        -n udev-libs -p /sbin/ldconfig
  
-%post  -n udev-glib -p /sbin/ldconfig
-%postun        -n udev-glib -p /sbin/ldconfig
-
  %files -f %{name}.lang
  %defattr(644,root,root,755)
-%doc DISTRO_PORTING NEWS README TODO
-/etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-/etc/dbus-1/system.d/org.freedesktop.import1.conf
-/etc/dbus-1/system.d/org.freedesktop.locale1.conf
-/etc/dbus-1/system.d/org.freedesktop.login1.conf
-/etc/dbus-1/system.d/org.freedesktop.machine1.conf
-/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-/etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-%ghost %config(noreplace) %{_sysconfdir}/machine-id
+%doc docs/{AUTOMATIC_BOOT_ASSESSMENT,BLOCK_DEVICE_LOCKING,BOOT_LOADER_INTERFACE,BOOT_LOADER_SPECIFICATION,DISTRO_PORTING,ENVIRONMENT,GROUP_RECORD,PREDICTABLE_INTERFACE_NAMES,TRANSIENT-SETTINGS,UIDS-GIDS,USER_GROUP_API,USER_RECORD}.md NEWS README TODO
+%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
+%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
+%attr(444,root,root) %ghost %config(noreplace) %{_sysconfdir}/machine-id
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostname
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/locale.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/machine-info
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/timezone
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vconsole.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/bootchart.conf
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/install.d
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/coredump.conf
  %if %{with microhttpd}
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-remote.conf
@@ -1119,17 +1124,13 @@ fi
  %endif
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journald.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/logind.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/pstore.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/sleep.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/timesyncd.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/user.conf
  %dir %{_sysconfdir}/systemd/user
-%dir %{_sysconfdir}/systemd/system/getty.target.wants
-%dir %{_sysconfdir}/systemd/system/multi-user.target.wants
-%dir %{_sysconfdir}/systemd/system/sockets.target.wants
-%dir %{_sysconfdir}/systemd/system/sysinit.target.wants
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/sysinit.target.wants/systemd-timesyncd.service
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
+
  %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/systemd-user
  /etc/xdg/systemd
  %attr(755,root,root) /bin/journalctl
@@ -1144,40 +1145,47 @@ fi
  %attr(755,root,root) /bin/systemd-notify
  %attr(755,root,root) /bin/systemd-sysusers
  %attr(755,root,root) /bin/systemd-tty-ask-password-agent
-%attr(755,root,root) %{_bindir}/bootctl
+%attr(755,root,root) /bin/userdbctl
+%{?with_efi:%attr(755,root,root) %{_bindir}/bootctl}
  %attr(755,root,root) %{_bindir}/busctl
  %attr(755,root,root) %{_bindir}/coredumpctl
  %attr(755,root,root) %{_bindir}/hostnamectl
  %attr(755,root,root) %{_bindir}/kernel-install
  %attr(755,root,root) %{_bindir}/localectl
  %attr(755,root,root) %{_bindir}/systemd-cat
-%attr(755,root,root) %{_bindir}/systemd-cgls
-%attr(755,root,root) %{_bindir}/systemd-cgtop
  %attr(755,root,root) %{_bindir}/systemd-delta
  %attr(755,root,root) %{_bindir}/systemd-detect-virt
+%attr(755,root,root) %{_bindir}/systemd-id128
+%attr(755,root,root) %{_bindir}/systemd-mount
  %attr(755,root,root) %{_bindir}/systemd-nspawn
  %attr(755,root,root) %{_bindir}/systemd-path
+%attr(755,root,root) %{_bindir}/systemd-resolve
  %attr(755,root,root) %{_bindir}/systemd-run
+%attr(755,root,root) %{_bindir}/systemd-socket-activate
  %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
  %attr(755,root,root) %{_bindir}/systemd-sysv-convert
+%attr(755,root,root) %{_bindir}/systemd-umount
  %attr(755,root,root) %{_bindir}/timedatectl
+/lib/modprobe.d/systemd.conf
  /lib/systemd/import-pubring.gpg
+/lib/systemd/resolv.conf
  %attr(755,root,root) /lib/systemd/pld-clean-tmp
-%attr(755,root,root) /lib/systemd/pld-storage-init
  %attr(755,root,root) /lib/systemd/systemd-ac-power
-%attr(755,root,root) /lib/systemd/systemd-activate
  %attr(755,root,root) /lib/systemd/systemd-backlight
  %attr(755,root,root) /lib/systemd/systemd-binfmt
-%attr(755,root,root) /lib/systemd/systemd-bootchart
-%attr(755,root,root) /lib/systemd/systemd-bus-proxyd
+%{?with_efi:%attr(755,root,root) /lib/systemd/systemd-bless-boot}
+%attr(755,root,root) /lib/systemd/systemd-boot-check-no-failures
  %attr(755,root,root) /lib/systemd/systemd-cgroups-agent
  %attr(755,root,root) /lib/systemd/systemd-coredump
  %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup}
+%attr(755,root,root) /lib/systemd/systemd-dissect
  %attr(755,root,root) /lib/systemd/systemd-export
  %attr(755,root,root) /lib/systemd/systemd-fsck
+%attr(755,root,root) /lib/systemd/systemd-growfs
  %attr(755,root,root) /lib/systemd/systemd-hibernate-resume
  %attr(755,root,root) /lib/systemd/systemd-hostnamed
  %attr(755,root,root) /lib/systemd/systemd-import
+%attr(755,root,root) /lib/systemd/systemd-import-fs
  %attr(755,root,root) /lib/systemd/systemd-importd
  %attr(755,root,root) /lib/systemd/systemd-initctl
  %attr(755,root,root) /lib/systemd/systemd-journald
@@ -1188,69 +1196,113 @@ fi
  %attr(755,root,root) /lib/systemd/systemd-localed
  %attr(755,root,root) /lib/systemd/systemd-logind
  %attr(755,root,root) /lib/systemd/systemd-machined
-%attr(755,root,root) /lib/systemd/systemd-machine-id-commit
+%attr(755,root,root) /lib/systemd/systemd-makefs
  %attr(755,root,root) /lib/systemd/systemd-modules-load
+%attr(755,root,root) /lib/systemd/systemd-pstore
  %attr(755,root,root) /lib/systemd/systemd-pull
  %attr(755,root,root) /lib/systemd/systemd-quotacheck
  %attr(755,root,root) /lib/systemd/systemd-random-seed
  %attr(755,root,root) /lib/systemd/systemd-remount-fs
  %attr(755,root,root) /lib/systemd/systemd-reply-password
-%attr(755,root,root) /lib/systemd/systemd-resolve-host
  %attr(755,root,root) /lib/systemd/systemd-rfkill
  %attr(755,root,root) /lib/systemd/systemd-shutdown
  %attr(755,root,root) /lib/systemd/systemd-sleep
  %attr(755,root,root) /lib/systemd/systemd-socket-proxyd
+%attr(755,root,root) /lib/systemd/systemd-sulogin-shell
  %attr(755,root,root) /lib/systemd/systemd-sysctl
+%attr(755,root,root) /lib/systemd/systemd-time-wait-sync
  %attr(755,root,root) /lib/systemd/systemd-timedated
  %attr(755,root,root) /lib/systemd/systemd-timesyncd
  %attr(755,root,root) /lib/systemd/systemd-udevd
  %attr(755,root,root) /lib/systemd/systemd-update-utmp
  %attr(755,root,root) /lib/systemd/systemd-update-done
+%attr(755,root,root) /lib/systemd/systemd-user-runtime-dir
  %attr(755,root,root) /lib/systemd/systemd-user-sessions
+%attr(755,root,root) /lib/systemd/systemd-userdbd
+%attr(755,root,root) /lib/systemd/systemd-userwork
  %attr(755,root,root) /lib/systemd/systemd-vconsole-setup
+%attr(755,root,root) /lib/systemd/systemd-veritysetup
+%attr(755,root,root) /lib/systemd/systemd-volatile-root
+%attr(755,root,root) /lib/systemd/systemd-xdg-autostart-condition
  %attr(755,root,root) /lib/systemd/systemd
  %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/system-generators/systemd-cryptsetup-generator}
+%{?with_efi:%attr(755,root,root) /lib/systemd/system-generators/systemd-bless-boot-generator}
  %attr(755,root,root) /lib/systemd/system-generators/systemd-debug-generator
-%attr(755,root,root) /lib/systemd/system-generators/systemd-efi-boot-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-fstab-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-getty-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-gpt-auto-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-hibernate-resume-generator
+%attr(755,root,root) /lib/systemd/system-generators/systemd-run-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-system-update-generator
  %attr(755,root,root) /lib/systemd/system-generators/systemd-sysv-generator
+%attr(755,root,root) /lib/systemd/system-generators/systemd-veritysetup-generator
+%dir /lib/systemd/network
+/lib/systemd/network/99-default.link
+/lib/udev/rules.d/60-input-id.rules
+/lib/udev/rules.d/60-sensor.rules
+/lib/udev/rules.d/70-joystick.rules
  /lib/udev/rules.d/70-uaccess.rules
  /lib/udev/rules.d/71-seat.rules
  /lib/udev/rules.d/73-seat-late.rules
  /lib/udev/rules.d/99-systemd.rules
-%dir %{_libexecdir}/kernel
-%dir %{_libexecdir}/kernel/install.d
-%{_libexecdir}/kernel/install.d/50-depmod.install
-%{_libexecdir}/kernel/install.d/90-loaderentry.install
-%dir %{_libexecdir}/systemd/catalog
-%{_libexecdir}/systemd/catalog/systemd.catalog
-%lang(fr) %{_libexecdir}/systemd/catalog/systemd.fr.catalog
-%lang(it) %{_libexecdir}/systemd/catalog/systemd.it.catalog
-%lang(pl) %{_libexecdir}/systemd/catalog/systemd.pl.catalog
-%lang(pt_BR) %{_libexecdir}/systemd/catalog/systemd.pt_BR.catalog
-%lang(ru) %{_libexecdir}/systemd/catalog/systemd.ru.catalog
-%dir %{_libexecdir}/sysusers.d
-%{_libexecdir}/sysusers.d/basic.conf
-%{_libexecdir}/sysusers.d/systemd.conf
-%if %{with microhttpd}
-%{_libexecdir}/sysusers.d/systemd-remote.conf
+%{_prefix}/lib/environment.d/99-environment.conf
+%dir %{_prefix}/lib/kernel
+%dir %{_prefix}/lib/kernel/install.d
+%{_prefix}/lib/kernel/install.d/00-entry-directory.install
+%{_prefix}/lib/kernel/install.d/50-depmod.install
+%{_prefix}/lib/kernel/install.d/90-loaderentry.install
+%if %{with efi}
+%dir %{_prefix}/lib/systemd/boot
+%dir %{_prefix}/lib/systemd/boot/efi
+%ifarch %{ix86}
+%{_prefix}/lib/systemd/boot/efi/linuxia32.efi.stub
+%{_prefix}/lib/systemd/boot/efi/systemd-bootia32.efi
+%endif
+%ifarch %{x8664} x32
+%{_prefix}/lib/systemd/boot/efi/linuxx64.efi.stub
+%{_prefix}/lib/systemd/boot/efi/systemd-bootx64.efi
+%endif
+%ifarch aarch64
+%{_prefix}/lib/systemd/boot/efi/linuxaa64.efi.stub
+%{_prefix}/lib/systemd/boot/efi/systemd-bootaa64.efi
+%endif
  %endif
-%{_libexecdir}/tmpfiles.d/etc.conf
-%{_libexecdir}/tmpfiles.d/home.conf
-%{_libexecdir}/tmpfiles.d/legacy.conf
-%{_libexecdir}/tmpfiles.d/systemd.conf
-%{_libexecdir}/tmpfiles.d/systemd-nologin.conf
+%{_prefix}/lib/systemd/catalog/systemd.catalog
+%lang(be) %{_prefix}/lib/systemd/catalog/systemd.be.catalog
+%lang(be) %{_prefix}/lib/systemd/catalog/systemd.be@latin.catalog
+%lang(bg) %{_prefix}/lib/systemd/catalog/systemd.bg.catalog
+%lang(de) %{_prefix}/lib/systemd/catalog/systemd.de.catalog
+%lang(fr) %{_prefix}/lib/systemd/catalog/systemd.fr.catalog
+%lang(it) %{_prefix}/lib/systemd/catalog/systemd.it.catalog
+%lang(pl) %{_prefix}/lib/systemd/catalog/systemd.pl.catalog
+%lang(pt_BR) %{_prefix}/lib/systemd/catalog/systemd.pt_BR.catalog
+%lang(ru) %{_prefix}/lib/systemd/catalog/systemd.ru.catalog
+%lang(zh_CN) %{_prefix}/lib/systemd/catalog/systemd.zh_CN.catalog
+%lang(zh_TW) %{_prefix}/lib/systemd/catalog/systemd.zh_TW.catalog
+%dir %{_prefix}/lib/sysusers.d
+%{_prefix}/lib/sysusers.d/basic.conf
+%{_prefix}/lib/sysusers.d/systemd.conf
  %if %{with microhttpd}
-%{_libexecdir}/tmpfiles.d/systemd-remote.conf
+%{_prefix}/lib/sysusers.d/systemd-remote.conf
+%endif
+%{_prefix}/lib/tmpfiles.d/etc.conf
+%{_prefix}/lib/tmpfiles.d/home.conf
+%{_prefix}/lib/tmpfiles.d/journal-nocow.conf
+%{_prefix}/lib/tmpfiles.d/legacy.conf
+%{_prefix}/lib/tmpfiles.d/static-nodes-permissions.conf
+%{_prefix}/lib/tmpfiles.d/systemd.conf
+%{_prefix}/lib/tmpfiles.d/systemd-nologin.conf
+%{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf
+%{_prefix}/lib/tmpfiles.d/systemd-pstore.conf
+%{_prefix}/lib/tmpfiles.d/systemd-tmp.conf
+%{_prefix}/lib/tmpfiles.d/tmp.conf
+%{_prefix}/lib/tmpfiles.d/var.conf
+%{_prefix}/lib/tmpfiles.d/x11.conf
+%{_prefix}/lib/sysctl.d/50-coredump.conf
+# if cc.sizeof('long') > 4
+%ifarch %{x8664} aarch64
+%{_prefix}/lib/sysctl.d/50-pid-max.conf
  %endif
-%{_libexecdir}/tmpfiles.d/tmp.conf
-%{_libexecdir}/tmpfiles.d/var.conf
-%{_libexecdir}/tmpfiles.d/x11.conf
-%{_libexecdir}/sysctl.d/50-coredump.conf
  %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
  %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
  %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
@@ -1259,6 +1311,7 @@ fi
  %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
  %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
  %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
  %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
  %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
  %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
@@ -1266,14 +1319,16 @@ fi
  %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
  %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
  %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
+%{_datadir}/polkit-1/rules.d/systemd-networkd.rules
  %dir %{_datadir}/systemd
  %{?with_microhttpd:%{_datadir}/systemd/gatewayd}
  %{_datadir}/systemd/kbd-model-map
  %{_datadir}/systemd/language-fallback-map
+%{_datadir}/factory/etc/issue
  %{_datadir}/factory/etc/nsswitch.conf
  %{_datadir}/factory/etc/pam.d/other
  %{_datadir}/factory/etc/pam.d/system-auth
-%{_mandir}/man1/bootctl.1*
+%{?with_efi:%{_mandir}/man1/bootctl.1*}
  %{_mandir}/man1/busctl.1*
  %{_mandir}/man1/coredumpctl.1*
  %{_mandir}/man1/hostnamectl.1*
@@ -1283,33 +1338,37 @@ fi
  %{_mandir}/man1/machinectl.1*
  %{_mandir}/man1/systemd.1*
  %{_mandir}/man1/systemd-ask-password.1*
-%{_mandir}/man1/systemd-bootchart.1*
  %{_mandir}/man1/systemd-cat.1*
-%{_mandir}/man1/systemd-cgls.1*
-%{_mandir}/man1/systemd-cgtop.1*
  %{_mandir}/man1/systemd-delta.1*
  %{_mandir}/man1/systemd-detect-virt.1*
  %{_mandir}/man1/systemd-escape.1*
  %{_mandir}/man1/systemd-firstboot.1*
  %{_mandir}/man1/systemd-firstboot.service.1*
+%{_mandir}/man1/systemd-id128.1*
  %{_mandir}/man1/systemd-inhibit.1*
-%{_mandir}/man1/systemd-machine-id-commit.1*
  %{_mandir}/man1/systemd-machine-id-setup.1*
+%{_mandir}/man1/systemd-mount.1*
  %{_mandir}/man1/systemd-notify.1*
  %{_mandir}/man1/systemd-nspawn.1*
  %{_mandir}/man1/systemd-path.1*
  %{_mandir}/man1/systemd-run.1*
+%{_mandir}/man1/systemd-socket-activate.1*
  %{_mandir}/man1/systemd-tty-ask-password-agent.1*
+%{_mandir}/man1/systemd-umount.1*
  %{_mandir}/man1/timedatectl.1*
+%{_mandir}/man1/userdbctl.1*
  %{_mandir}/man5/binfmt.d.5*
-%{_mandir}/man5/bootchart.conf.5*
-%{_mandir}/man5/bootchart.conf.d.5*
  %{_mandir}/man5/coredump.conf.5*
  %{_mandir}/man5/coredump.conf.d.5*
+%{_mandir}/man5/dnssec-trust-anchors.d.5*
  %{_mandir}/man5/hostname.5*
+%{_mandir}/man5/journald@.conf.5*
+%{?with_efi:%{_mandir}/man5/loader.conf.5*}
  %if %{with microhttpd}
  %{_mandir}/man5/journal-remote.conf.5*
  %{_mandir}/man5/journal-remote.conf.d.5*
+%{_mandir}/man5/journal-upload.conf.5.*
+%{_mandir}/man5/journal-upload.conf.d.5*
  %endif
  %{_mandir}/man5/journald.conf.5*
  %{_mandir}/man5/journald.conf.d.5*
@@ -1320,7 +1379,17 @@ fi
  %{_mandir}/man5/machine-id.5*
  %{_mandir}/man5/machine-info.5*
  %{_mandir}/man5/modules-load.d.5*
+%{_mandir}/man5/org.freedesktop.LogControl1.5*
+%{_mandir}/man5/org.freedesktop.hostname1.5*
+%{_mandir}/man5/org.freedesktop.import1.5*
+%{_mandir}/man5/org.freedesktop.locale1.5*
+%{_mandir}/man5/org.freedesktop.login1.5*
+%{_mandir}/man5/org.freedesktop.machine1.5*
+%{_mandir}/man5/org.freedesktop.systemd1.5*
+%{_mandir}/man5/org.freedesktop.timedate1.5*
  %{_mandir}/man5/os-release.5*
+%{_mandir}/man5/pstore.conf.5*
+%{_mandir}/man5/pstore.conf.d.5*
  %{_mandir}/man5/sleep.conf.d.5*
  %{_mandir}/man5/sysctl.d.5*
  %{_mandir}/man5/system.conf.d.5*
@@ -1328,6 +1397,7 @@ fi
  %{_mandir}/man5/systemd-sleep.conf.5*
  %{_mandir}/man5/systemd-system.conf.5*
  %{_mandir}/man5/systemd-user.conf.5*
+%{_mandir}/man5/systemd-user-runtime-dir.5*
  %{_mandir}/man5/sysusers.d.5*
  %{_mandir}/man5/timesyncd.conf.5*
  %{_mandir}/man5/timesyncd.conf.d.5*
@@ -1337,57 +1407,78 @@ fi
  %{_mandir}/man7/daemon.7*
  %{_mandir}/man7/file-hierarchy.7*
  %{_mandir}/man7/kernel-command-line.7*
+%{?with_efi:%{_mandir}/man7/sd-boot.7*}
+%{?with_efi:%{_mandir}/man7/systemd-boot.7*}
  %{_mandir}/man7/systemd.directives.7*
+%{_mandir}/man7/systemd.environment-generator.7*
  %{_mandir}/man7/systemd.generator.7*
  %{_mandir}/man7/systemd.index.7*
  %{_mandir}/man7/systemd.journal-fields.7*
+%{_mandir}/man7/systemd.offline-updates.7*
  %{_mandir}/man7/systemd.special.7*
+%{_mandir}/man7/systemd.syntax.7*
  %{_mandir}/man7/systemd.time.7*
  %{_mandir}/man8/kernel-install.8*
  %{_mandir}/man8/libnss_myhostname.so.2.8*
  %{_mandir}/man8/libnss_mymachines.so.2.8*
  %{_mandir}/man8/nss-myhostname.8*
  %{_mandir}/man8/nss-mymachines.8*
-%{_mandir}/man8/systemd-activate.8*
  %{_mandir}/man8/systemd-backlight.8*
  %{_mandir}/man8/systemd-binfmt.8*
+%if %{with efi}
+%{_mandir}/man8/systemd-bless-boot.8*
+%{_mandir}/man8/systemd-bless-boot-generator.8*
+%endif
+%{_mandir}/man8/systemd-boot-check-no-failures.8*
  %{_mandir}/man8/systemd-coredump.8*
  %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*}
  %{_mandir}/man8/systemd-debug-generator.8*
  %{_mandir}/man8/systemd-fsck.8*
-%{_mandir}/man8/systemd-efi-boot-generator.8*
-%{_mandir}/man8/systemd-gpt-auto-generator.8*
  %{_mandir}/man8/systemd-fstab-generator.8*
  %{_mandir}/man8/systemd-getty-generator.8*
+%{_mandir}/man8/systemd-gpt-auto-generator.8*
+%{_mandir}/man8/systemd-growfs.8*
+%{_mandir}/man8/systemd-growfs@.service.8*
  %{_mandir}/man8/systemd-hibernate-resume-generator.8*
  %{_mandir}/man8/systemd-hibernate-resume.8*
  %{_mandir}/man8/systemd-hibernate-resume@.service.8*
  %{_mandir}/man8/systemd-hostnamed.8*
+%{_mandir}/man8/systemd-importd.8*
  %{_mandir}/man8/systemd-initctl.8*
  %{_mandir}/man8/systemd-journald-dev-log.socket.8*
+%{_mandir}/man8/systemd-journald-varlink@.socket.8*
  %{_mandir}/man8/systemd-journald.8*
+%{_mandir}/man8/systemd-journald@.service.8*
+%{_mandir}/man8/systemd-journald@.socket.8*
  %if %{with microhttpd}
-%{_mandir}/man8/systemd-journal-remote.8.*
-%{_mandir}/man8/systemd-journal-upload.8.*
+%{_mandir}/man8/systemd-journal-remote.8*
+%{_mandir}/man8/systemd-journal-upload.8*
  %endif
  %{_mandir}/man8/systemd-localed.8*
  %{_mandir}/man8/systemd-logind.8*
  %{_mandir}/man8/systemd-machined.8*
  %{_mandir}/man8/systemd-machine-id-commit.service.8*
+%{_mandir}/man8/systemd-makefs.8*
+%{_mandir}/man8/systemd-makefs@.service.8*
+%{_mandir}/man8/systemd-mkswap@.service.8*
  %{_mandir}/man8/systemd-modules-load.8*
+%{_mandir}/man8/systemd-pstore.8*
+%{_mandir}/man8/systemd-pstore.service.8*
  %{_mandir}/man8/systemd-quotacheck.8*
  %{_mandir}/man8/systemd-random-seed.8*
  %{_mandir}/man8/systemd-remount-fs.8*
  %{_mandir}/man8/systemd-rfkill.8*
-%{_mandir}/man8/systemd-rfkill@.service.8*
+%{_mandir}/man8/systemd-rfkill.service.8*
+%{_mandir}/man8/systemd-run-generator.8*
  %{_mandir}/man8/systemd-shutdown.8*
  %{_mandir}/man8/systemd-sleep.8*
  %{_mandir}/man8/systemd-socket-proxyd.8*
  %{_mandir}/man8/systemd-sysctl.8*
  %{_mandir}/man8/systemd-system-update-generator.8*
-%{_mandir}/man8/systemd-sysv-generator.8*
  %{_mandir}/man8/systemd-sysusers.8*
  %{_mandir}/man8/systemd-sysusers.service.8*
+%{_mandir}/man8/systemd-sysv-generator.8*
+%{_mandir}/man8/systemd-time-wait-sync.8*
  %{_mandir}/man8/systemd-timedated.8*
  %{_mandir}/man8/systemd-timesyncd.8*
  %{_mandir}/man8/systemd-timesyncd.service.8*
@@ -1396,13 +1487,23 @@ fi
  %{_mandir}/man8/systemd-update-done.service.8*
  %{_mandir}/man8/systemd-update-utmp.8*
  %{_mandir}/man8/systemd-user-sessions.8*
+%{_mandir}/man8/systemd-userdbd.8*
  %{_mandir}/man8/systemd-vconsole-setup.8*
-%dir /var/lib/machines
+%{_mandir}/man8/systemd-veritysetup.8*
+%{_mandir}/man8/systemd-veritysetup-generator.8*
+%{_mandir}/man8/systemd-veritysetup@.service.8*
+%{_mandir}/man8/systemd-volatile-root.8*
+%{_mandir}/man8/systemd-volatile-root.service.8*
+%{_mandir}/man8/systemd-xdg-autostart-generator.8*
+%attr(700,root,root) %dir /var/lib/machines
  %dir /var/lib/%{name}
  %dir /var/lib/%{name}/coredump
-%attr(640,root,root) %ghost /var/log/btmp
+%dir /var/lib/%{name}/catalog
+%attr(640,root,root) %ghost /var/lib/%{name}/random-seed
+%attr(600,root,utmp) %ghost /var/log/btmp
  %attr(664,root,utmp) %ghost /var/log/wtmp
  %attr(2755,root,systemd-journal) %dir /var/log/journal
+%attr(2755,root,systemd-journal) %dir /var/log/journal/remote
  
  %if %{with pam}
  %attr(755,root,root) /%{_lib}/security/pam_systemd.so
@@ -1439,27 +1540,40 @@ fi
  %dir %{_sysconfdir}/systemd/system-preset
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system-preset/default.preset
  %dir %{_sysconfdir}/tmpfiles.d
-%dir %{_libexecdir}/binfmt.d
-%dir %{_libexecdir}/modules-load.d
-%dir %{_libexecdir}/sysctl.d
-%{_libexecdir}/sysctl.d/50-default.conf
-%dir %{_libexecdir}/systemd
-%dir %{_libexecdir}/systemd/system-shutdown
-%dir %{_libexecdir}/systemd/system-sleep
-%dir %{_libexecdir}/systemd/user
-%{_libexecdir}/systemd/user/basic.target
-%{_libexecdir}/systemd/user/bluetooth.target
-%{_libexecdir}/systemd/user/default.target
-%{_libexecdir}/systemd/user/exit.target
-%{_libexecdir}/systemd/user/paths.target
-%{_libexecdir}/systemd/user/printer.target
-%{_libexecdir}/systemd/user/shutdown.target
-%{_libexecdir}/systemd/user/smartcard.target
-%{_libexecdir}/systemd/user/sockets.target
-%{_libexecdir}/systemd/user/sound.target
-%{_libexecdir}/systemd/user/timers.target
-%{_libexecdir}/systemd/user/systemd-exit.service
-%dir %{_libexecdir}/systemd/user-generators
+%dir %{_prefix}/lib/environment.d
+%dir %{_prefix}/lib/modules-load.d
+%dir %{_prefix}/lib/sysctl.d
+%{_prefix}/lib/sysctl.d/50-default.conf
+%dir %{_prefix}/lib/systemd
+%dir %{_prefix}/lib/systemd/catalog
+%dir %{_prefix}/lib/systemd/system-shutdown
+%dir %{_prefix}/lib/systemd/system-sleep
+%dir %{_prefix}/lib/systemd/user
+%{_prefix}/lib/systemd/user/basic.target
+%{_prefix}/lib/systemd/user/bluetooth.target
+%{_prefix}/lib/systemd/user/default.target
+%{_prefix}/lib/systemd/user/exit.target
+%{_prefix}/lib/systemd/user/paths.target
+%{_prefix}/lib/systemd/user/printer.target
+%{_prefix}/lib/systemd/user/shutdown.target
+%{_prefix}/lib/systemd/user/smartcard.target
+%{_prefix}/lib/systemd/user/sockets.target
+%{_prefix}/lib/systemd/user/sound.target
+%{_prefix}/lib/systemd/user/systemd-tmpfiles-clean.service
+%{_prefix}/lib/systemd/user/systemd-tmpfiles-clean.timer
+%{_prefix}/lib/systemd/user/systemd-tmpfiles-setup.service
+%{_prefix}/lib/systemd/user/timers.target
+%{_prefix}/lib/systemd/user/systemd-exit.service
+%{_prefix}/lib/systemd/user/xdg-desktop-autostart.target
+%dir %{_prefix}/lib/systemd/user-generators
+%attr(755,root,root) %{_prefix}/lib/systemd/user-generators/systemd-xdg-autostart-generator
+%dir %{_prefix}/lib/systemd/user-environment-generators
+%attr(755,root,root) %{_prefix}/lib/systemd/user-environment-generators/30-systemd-environment-d-generator
+%dir %{_prefix}/lib/systemd/user-preset
+%{_prefix}/lib/systemd/user-preset/90-systemd.preset
+%dir %{_prefix}/lib/systemd/system-environment-generators
+%dir /lib/systemd/ntp-units.d
+/lib/systemd/ntp-units.d/80-systemd-timesync.list
  %dir /lib/systemd/pld-helpers.d
  %dir /lib/systemd/system-generators
  %dir /lib/systemd/system-preset
@@ -1471,16 +1585,25 @@ fi
  %attr(755,root,root) /bin/systemd_booted
  %{_mandir}/man1/systemctl.1*
  %{_mandir}/man5/tmpfiles.d.5*
+%{_mandir}/man5/environment.d.5*
  %{_mandir}/man8/systemd-tmpfiles.8*
  %{_npkgconfigdir}/systemd.pc
  
-%{systemdunitdir}/proc-sys-fs-binfmt_misc.automount
  %{systemdunitdir}/dev-hugepages.mount
  %{systemdunitdir}/dev-mqueue.mount
+%{systemdunitdir}/initrd-root-device.target
+%{systemdunitdir}/proc-sys-fs-binfmt_misc.automount
  %{systemdunitdir}/proc-sys-fs-binfmt_misc.mount
+%{systemdunitdir}/sockets.target.wants/systemd-coredump.socket
  %{systemdunitdir}/sys-fs-fuse-connections.mount
  %{systemdunitdir}/sys-kernel-config.mount
  %{systemdunitdir}/sys-kernel-debug.mount
+%{systemdunitdir}/sys-kernel-tracing.mount
+%{systemdunitdir}/systemd-coredump@.service
+%{systemdunitdir}/systemd-coredump.socket
+%{systemdunitdir}/systemd-exit.service
+%{systemdunitdir}/systemd-pstore.service
+%{systemdunitdir}/systemd-rfkill.socket
  %{systemdunitdir}/tmp.mount
  %{systemdunitdir}/var-lib-machines.mount
  %{systemdunitdir}/var-lock.mount
@@ -1490,7 +1613,6 @@ fi
  %{systemdunitdir}/allowlogin.service
  %{systemdunitdir}/autovt@.service
  %{systemdunitdir}/console-getty.service
-%{systemdunitdir}/console-shell.service
  %{systemdunitdir}/console.service
  %{systemdunitdir}/container-getty@.service
  %{systemdunitdir}/cpusets.service
@@ -1504,7 +1626,6 @@ fi
  %{systemdunitdir}/display-manager.service
  %{systemdunitdir}/emergency.service
  %{systemdunitdir}/getty@.service
-%{systemdunitdir}/halt-local.service
  %{systemdunitdir}/initrd-cleanup.service
  %{systemdunitdir}/initrd-parse-etc.service
  %{systemdunitdir}/initrd-switch-root.service
@@ -1512,24 +1633,28 @@ fi
  %{systemdunitdir}/killall.service
  %{systemdunitdir}/kmod-static-nodes.service
  %{systemdunitdir}/ldconfig.service
+%{systemdunitdir}/modprobe@.service
  %{systemdunitdir}/netfs.service
  %{systemdunitdir}/network.service
  %{systemdunitdir}/pld-clean-tmp.service
-%{systemdunitdir}/pld-storage-init-late.service
-%{systemdunitdir}/pld-storage-init.service
-%{systemdunitdir}/pld-wait-storage.service
  %{systemdunitdir}/prefdm.service
  %{systemdunitdir}/quotaon.service
  %{systemdunitdir}/random.service
  %{systemdunitdir}/rescue.service
  %{systemdunitdir}/serial-getty@.service
  %{systemdunitdir}/single.service
+%{systemdunitdir}/sigpwr-container-shutdown.service
+%{systemdunitdir}/suspend-then-hibernate.target
  %{systemdunitdir}/sys-kernel-config.service
+%{systemdunitdir}/system-update-cleanup.service
+%{systemdunitdir}/system-update-pre.target
  %{systemdunitdir}/systemd-ask-password-console.service
  %{systemdunitdir}/systemd-ask-password-wall.service
  %{systemdunitdir}/systemd-backlight@.service
  %{systemdunitdir}/systemd-binfmt.service
-%{systemdunitdir}/systemd-bootchart.service
+%{?with_efi:%{systemdunitdir}/systemd-bless-boot.service}
+%{?with_efi:%{systemdunitdir}/systemd-boot-system-token.service}
+%{systemdunitdir}/systemd-boot-check-no-failures.service
  %{systemdunitdir}/systemd-firstboot.service
  %{systemdunitdir}/systemd-fsck-root.service
  %{systemdunitdir}/systemd-fsck@.service
@@ -1547,6 +1672,7 @@ fi
  %{systemdunitdir}/systemd-journal-remote.service
  %{systemdunitdir}/systemd-journal-upload.service
  %{systemdunitdir}/systemd-journald.service
+%{systemdunitdir}/systemd-journald@.service
  %{systemdunitdir}/systemd-kexec.service
  %{systemdunitdir}/systemd-localed.service
  %{systemdunitdir}/systemd-logind.service
@@ -1559,10 +1685,12 @@ fi
  %{systemdunitdir}/systemd-random-seed.service
  %{systemdunitdir}/systemd-reboot.service
  %{systemdunitdir}/systemd-remount-fs.service
-%{systemdunitdir}/systemd-rfkill@.service
+%{systemdunitdir}/systemd-rfkill.service
  %{systemdunitdir}/systemd-suspend.service
+%{systemdunitdir}/systemd-suspend-then-hibernate.service
  %{systemdunitdir}/systemd-sysctl.service
  %{systemdunitdir}/systemd-sysusers.service
+%{systemdunitdir}/systemd-time-wait-sync.service
  %{systemdunitdir}/systemd-timedated.service
  %{systemdunitdir}/systemd-timesyncd.service
  %{systemdunitdir}/systemd-tmpfiles-clean.service
@@ -1571,15 +1699,22 @@ fi
  %{systemdunitdir}/systemd-udev-settle.service
  %{systemdunitdir}/systemd-udev-trigger.service
  %{systemdunitdir}/systemd-udevd.service
+%dir %{systemdunitdir}/systemd-udevd.service.d
  %{systemdunitdir}/systemd-update-done.service
  %{systemdunitdir}/systemd-update-utmp-runlevel.service
  %{systemdunitdir}/systemd-update-utmp.service
  %{systemdunitdir}/systemd-user-sessions.service
+%{systemdunitdir}/systemd-userdbd.service
+%{systemdunitdir}/systemd-userdbd.socket
  %{systemdunitdir}/systemd-vconsole-setup.service
+%{systemdunitdir}/systemd-volatile-root.service
  %{systemdunitdir}/user@.service
-%{systemdunitdir}/-.slice
  %{systemdunitdir}/machine.slice
-%{systemdunitdir}/system.slice
+#%{systemdunitdir}/system.slice
+%{?with_cryptsetup:%{systemdunitdir}/system-systemd\x2dcryptsetup.slice}
+%dir %{systemdunitdir}/user-.slice.d
+%{systemdunitdir}/user-.slice.d/10-defaults.conf
+%{systemdunitdir}/user-runtime-dir@.service
  %{systemdunitdir}/user.slice
  %exclude %{systemdunitdir}/rc-inetd.service
  %{systemdunitdir}/syslog.socket
@@ -1587,18 +1722,24 @@ fi
  %{systemdunitdir}/systemd-journal-remote.socket
  %{systemdunitdir}/systemd-journald-audit.socket
  %{systemdunitdir}/systemd-journald-dev-log.socket
+%{systemdunitdir}/systemd-journald-varlink@.socket
  %{systemdunitdir}/systemd-journald.socket
+%{systemdunitdir}/systemd-journald@.socket
  %{systemdunitdir}/systemd-udevd-control.socket
  %{systemdunitdir}/systemd-udevd-kernel.socket
  %{systemdunitdir}/basic.target
+%{systemdunitdir}/blockdev@.target
  %{systemdunitdir}/bluetooth.target
+%{systemdunitdir}/boot-complete.target
  %{?with_cryptsetup:%{systemdunitdir}/cryptsetup-pre.target}
  %{?with_cryptsetup:%{systemdunitdir}/cryptsetup.target}
  %{systemdunitdir}/ctrl-alt-del.target
  %{systemdunitdir}/default.target
  %{systemdunitdir}/emergency.target
+%{systemdunitdir}/exit.target
  %{systemdunitdir}/final.target
  %{systemdunitdir}/getty.target
+%{systemdunitdir}/getty-pre.target
  %{systemdunitdir}/graphical.target
  %{systemdunitdir}/halt.target
  %{systemdunitdir}/hibernate.target
@@ -1623,6 +1764,9 @@ fi
  %{systemdunitdir}/reboot.target
  %{systemdunitdir}/remote-fs-pre.target
  %{systemdunitdir}/remote-fs.target
+%if %{with cryptsetup}
+%{systemdunitdir}/remote-cryptsetup.target
+%endif
  %{systemdunitdir}/rescue.target
  %{systemdunitdir}/rpcbind.target
  %{systemdunitdir}/runlevel0.target
@@ -1643,43 +1787,50 @@ fi
  %{systemdunitdir}/swap.target
  %{systemdunitdir}/sysinit.target
  %{systemdunitdir}/system-update.target
+%{systemdunitdir}/time-set.target
  %{systemdunitdir}/time-sync.target
  %{systemdunitdir}/timers.target
  %{systemdunitdir}/umount.target
+%{systemdunitdir}/usb-gadget.target
  %{systemdunitdir}/systemd-tmpfiles-clean.timer
  %dir %{systemdunitdir}/basic.target.wants
  %dir %{systemdunitdir}/dbus.target.wants
+%dir %{systemdunitdir}/final.target.wants
  %dir %{systemdunitdir}/graphical.target.wants
  %dir %{systemdunitdir}/halt.target.wants
  %dir %{systemdunitdir}/initrd.target.wants
  %dir %{systemdunitdir}/kexec.target.wants
  %dir %{systemdunitdir}/local-fs.target.wants
+%dir %{systemdunitdir}/machines.target.wants
  %dir %{systemdunitdir}/multi-user.target.wants
  %dir %{systemdunitdir}/poweroff.target.wants
  %dir %{systemdunitdir}/reboot.target.wants
+%dir %{systemdunitdir}/remote-fs.target.wants
  %dir %{systemdunitdir}/rescue.target.wants
  %dir %{systemdunitdir}/runlevel[12345].target.wants
  %dir %{systemdunitdir}/shutdown.target.wants
+%dir %{systemdunitdir}/sigpwr.target.wants
  %dir %{systemdunitdir}/sockets.target.wants
+%dir %{systemdunitdir}/sound.target.wants
  %dir %{systemdunitdir}/sysinit.target.wants
  %dir %{systemdunitdir}/syslog.target.wants
+%dir %{systemdunitdir}/system-update.target.wants
  %dir %{systemdunitdir}/timers.target.wants
  %{systemdunitdir}/graphical.target.wants/display-manager.service
  %{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
  %{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service
-%{systemdunitdir}/local-fs.target.wants/pld-storage-init-late.service
-%{systemdunitdir}/local-fs.target.wants/pld-storage-init.service
-%{systemdunitdir}/local-fs.target.wants/systemd-remount-fs.service
-%{systemdunitdir}/local-fs.target.wants/var-lib-machines.mount
  %{systemdunitdir}/local-fs.target.wants/var-lock.mount
  %{systemdunitdir}/local-fs.target.wants/var-run.mount
+%{systemdunitdir}/machines.target.wants/var-lib-machines.mount
  %{systemdunitdir}/multi-user.target.wants/getty.target
  %{systemdunitdir}/multi-user.target.wants/rc-local.service
  %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
  %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
  %{systemdunitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
  %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
+%{systemdunitdir}/remote-fs.target.wants/var-lib-machines.mount
  %{systemdunitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
+%{systemdunitdir}/sigpwr.target.wants/sigpwr-container-shutdown.service
  %{systemdunitdir}/sockets.target.wants/systemd-initctl.socket
  %{systemdunitdir}/sockets.target.wants/systemd-journald-audit.socket
  %{systemdunitdir}/sockets.target.wants/systemd-journald-dev-log.socket
@@ -1694,8 +1845,10 @@ fi
  %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
  %{systemdunitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount
  %{systemdunitdir}/sysinit.target.wants/sys-kernel-debug.mount
+%{systemdunitdir}/sysinit.target.wants/sys-kernel-tracing.mount
  %{systemdunitdir}/sysinit.target.wants/systemd-ask-password-console.path
  %{systemdunitdir}/sysinit.target.wants/systemd-binfmt.service
+%{?with_efi:%{systemdunitdir}/sysinit.target.wants/systemd-boot-system-token.service}
  %{systemdunitdir}/sysinit.target.wants/systemd-firstboot.service
  %{systemdunitdir}/sysinit.target.wants/systemd-hwdb-update.service
  %{systemdunitdir}/sysinit.target.wants/systemd-journal-catalog-update.service
@@ -1712,14 +1865,25 @@ fi
  %{systemdunitdir}/sysinit.target.wants/systemd-udev-trigger.service
  %{systemdunitdir}/sysinit.target.wants/systemd-update-done.service
  %{systemdunitdir}/sysinit.target.wants/systemd-update-utmp.service
-%{systemdunitdir}/sysinit.target.wants/systemd-vconsole-setup.service
  %{systemdunitdir}/timers.target.wants/systemd-tmpfiles-clean.timer
+%dir %{systemduserunitdir}/sockets.target.wants
+%{systemduserunitdir}/graphical-session-pre.target
+%{systemduserunitdir}/graphical-session.target
+%{_mandir}/man5/user@.service.5*
+%{_mandir}/man5/user-runtime-dir@.service.5*
+%{_mandir}/man8/30-systemd-environment-d-generator.8*
+%{_mandir}/man8/systemd-environment-d-generator.8*
  %{_mandir}/man8/systemd-ask-password-console.path.8*
  %{_mandir}/man8/systemd-ask-password-console.service.8*
  %{_mandir}/man8/systemd-ask-password-wall.path.8*
  %{_mandir}/man8/systemd-ask-password-wall.service.8*
  %{_mandir}/man8/systemd-backlight@.service.8*
  %{_mandir}/man8/systemd-binfmt.service.8*
+%{?with_efi:%{_mandir}/man8/systemd-bless-boot.service.8*}
+%{_mandir}/man8/systemd-boot-check-no-failures.service.8*
+%{?with_efi:%{_mandir}/man8/systemd-boot-system-token.service.8*}
+%{_mandir}/man8/systemd-coredump.socket.8*
+%{_mandir}/man8/systemd-coredump@.service.8*
  %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup.8*}
  %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup@.service.8*}
  %{_mandir}/man8/systemd-fsck-root.service.8*
@@ -1728,10 +1892,15 @@ fi
  %{_mandir}/man8/systemd-hibernate.service.8*
  %{_mandir}/man8/systemd-hostnamed.service.8*
  %{_mandir}/man8/systemd-hybrid-sleep.service.8*
+%{_mandir}/man8/systemd-importd.service.8*
  %{_mandir}/man8/systemd-initctl.service.8*
  %{_mandir}/man8/systemd-initctl.socket.8*
+%{_mandir}/man8/systemd-journal-remote.service.8*
+%{_mandir}/man8/systemd-journal-remote.socket.8*
+%{_mandir}/man8/systemd-journal-upload.service.8*
  %{_mandir}/man8/systemd-journald.service.8*
  %{_mandir}/man8/systemd-journald.socket.8*
+%{_mandir}/man8/systemd-journald-audit.socket.8*
  %{_mandir}/man8/systemd-kexec.service.8*
  %{_mandir}/man8/systemd-localed.service.8*
  %{_mandir}/man8/systemd-logind.service.8*
@@ -1742,21 +1911,33 @@ fi
  %{_mandir}/man8/systemd-random-seed.service.8*
  %{_mandir}/man8/systemd-reboot.service.8*
  %{_mandir}/man8/systemd-remount-fs.service.8*
+%{_mandir}/man8/systemd-rfkill.socket.8*
  %{_mandir}/man8/systemd-suspend.service.8*
+%{_mandir}/man8/systemd-suspend-then-hibernate.service.8*
  %{_mandir}/man8/systemd-sysctl.service.8*
+%{_mandir}/man8/systemd-time-wait-sync.service.8*
  %{_mandir}/man8/systemd-timedated.service.8*
  %{_mandir}/man8/systemd-tmpfiles-clean.service.8*
  %{_mandir}/man8/systemd-tmpfiles-clean.timer.8*
  %{_mandir}/man8/systemd-tmpfiles-setup.service.8*
  %{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8*
+%{_mandir}/man8/systemd-udev-settle.service.8*
  %{_mandir}/man8/systemd-udevd.service.8*
  %{_mandir}/man8/systemd-udevd-control.socket.8*
  %{_mandir}/man8/systemd-udevd-kernel.socket.8*
  %{_mandir}/man8/systemd-update-utmp-runlevel.service.8*
  %{_mandir}/man8/systemd-update-utmp.service.8*
  %{_mandir}/man8/systemd-user-sessions.service.8*
+%{_mandir}/man8/systemd-userdbd.service.8*
  %{_mandir}/man8/systemd-vconsole-setup.service.8*
  
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/systemd-cgls
+%attr(755,root,root) %{_bindir}/systemd-cgtop
+%{_mandir}/man1/systemd-cgls.1*
+%{_mandir}/man1/systemd-cgtop.1*
+
  %if %{with microhttpd}
  %files journal-gateway
  %defattr(644,root,root,755)
@@ -1769,36 +1950,73 @@ fi
  
  %files networkd
  %defattr(644,root,root,755)
-/etc/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/networkd.conf
  %dir %{_sysconfdir}/systemd/network
-%dir %{_sysconfdir}/systemd/system/network-online.target.wants
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
-%dir /lib/systemd/network
  /lib/systemd/network/80-container-host0.network
  /lib/systemd/network/80-container-ve.network
-/lib/systemd/network/99-default.link
-%{systemdunitdir}/dbus-org.freedesktop.network1.service
+/lib/systemd/network/80-container-vz.network
+/lib/systemd/network/80-vm-vt.network
+/lib/systemd/network/80-wifi-adhoc.network
+%{systemdunitdir}/systemd-network-generator.service
  %{systemdunitdir}/systemd-networkd-wait-online.service
  %{systemdunitdir}/systemd-networkd.service
  %{systemdunitdir}/systemd-networkd.socket
  %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
  %attr(755,root,root) /bin/networkctl
+%attr(755,root,root) /lib/systemd/systemd-network-generator
  %attr(755,root,root) /lib/systemd/systemd-networkd
  %attr(755,root,root) /lib/systemd/systemd-networkd-wait-online
  %{_mandir}/man1/networkctl.1*
+%{_mandir}/man5/networkd.conf.5*
+%{_mandir}/man5/networkd.conf.d.5*
+%{_mandir}/man7/systemd.net-naming-scheme.7*
+%{_mandir}/man8/systemd-network-generator.8*
+%{_mandir}/man8/systemd-network-generator.service.8*
  %{_mandir}/man8/systemd-networkd-wait-online.8*
  %{_mandir}/man8/systemd-networkd-wait-online.service.8*
  %{_mandir}/man8/systemd-networkd.8*
  %{_mandir}/man8/systemd-networkd.service.8*
  
+%files portabled
+%defattr(644,root,root,755)
+%doc docs/PORTABLE_SERVICES.md
+%attr(755,root,root) /bin/portablectl
+%attr(755,root,root) /lib/systemd/systemd-portabled
+%{systemdunitdir}/dbus-org.freedesktop.portable1.service
+%{systemdunitdir}/systemd-portabled.service
+%dir /lib/systemd/portable
+%dir /lib/systemd/portable/profile
+%dir /lib/systemd/portable/profile/default
+/lib/systemd/portable/profile/default/service.conf
+%dir /lib/systemd/portable/profile/nonetwork
+/lib/systemd/portable/profile/nonetwork/service.conf
+%dir /lib/systemd/portable/profile/strict
+/lib/systemd/portable/profile/strict/service.conf
+%dir /lib/systemd/portable/profile/trusted
+/lib/systemd/portable/profile/trusted/service.conf
+%{systemdtmpfilesdir}/portables.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
+%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
+%{_mandir}/man1/portablectl.1*
+%{_mandir}/man8/systemd-portabled.8*
+%{_mandir}/man8/systemd-portabled.service.8*
+
  %files resolved
  %defattr(644,root,root,755)
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/resolved.conf
-/etc/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
  %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
-%{systemdunitdir}/dbus-org.freedesktop.resolve1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
  %{systemdunitdir}/systemd-resolved.service
+%attr(755,root,root) /sbin/resolvconf
+%attr(755,root,root) %{_bindir}/resolvectl
  %attr(755,root,root) /lib/systemd/systemd-resolved
+%{_mandir}/man1/resolvconf.1*
+%{_mandir}/man1/resolvectl.1*
+%{_mandir}/man5/org.freedesktop.resolve1.5*
  %{_mandir}/man5/resolved.conf.5*
  %{_mandir}/man5/resolved.conf.d.5*
  %{_mandir}/man8/systemd-resolved.8*
@@ -1816,91 +2034,79 @@ fi
  
  %files libs
  %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnss_mymachines.so.2
-%attr(755,root,root) %{_libdir}/libnss_resolve.so.2
  %attr(755,root,root) /%{_lib}/libnss_myhostname.so.2
+%attr(755,root,root) /%{_lib}/libnss_mymachines.so.2
+%attr(755,root,root) /%{_lib}/libnss_resolve.so.2
+%attr(755,root,root) /%{_lib}/libnss_systemd.so.2
  %attr(755,root,root) /%{_lib}/libsystemd.so.*.*.*
  %attr(755,root,root) %ghost /%{_lib}/libsystemd.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-daemon.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-id128.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-id128.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-journal.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-journal.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-login.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-login.so.0
+%attr(755,root,root) /lib/systemd/libsystemd-shared*.so
+%{_mandir}/man8/libnss_resolve.so.2.8*
+%{_mandir}/man8/libnss_systemd.so.2.8*
+%{_mandir}/man8/nss-resolve.8*
+%{_mandir}/man8/nss-systemd.8*
  
  %files devel
  %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsystemd.so
-%attr(755,root,root) %{_libdir}/libsystemd-daemon.so
-%attr(755,root,root) %{_libdir}/libsystemd-id128.so
-%attr(755,root,root) %{_libdir}/libsystemd-journal.so
-%attr(755,root,root) %{_libdir}/libsystemd-login.so
+%attr(755,root,root) /%{_lib}/libsystemd.so
  %{_includedir}/%{name}
  %{_pkgconfigdir}/libsystemd.pc
-%{_pkgconfigdir}/libsystemd-daemon.pc
-%{_pkgconfigdir}/libsystemd-id128.pc
-%{_pkgconfigdir}/libsystemd-journal.pc
-%{_pkgconfigdir}/libsystemd-login.pc
  %{_mandir}/man3/SD_*.3*
  %{_mandir}/man3/sd*.3*
  
-%files -n python-systemd
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/systemd
-%{py_sitedir}/systemd/*.py[co]
-%attr(755,root,root) %{py_sitedir}/systemd/_daemon.so
-%attr(755,root,root) %{py_sitedir}/systemd/_journal.so
-%attr(755,root,root) %{py_sitedir}/systemd/_reader.so
-%attr(755,root,root) %{py_sitedir}/systemd/id128.so
-%attr(755,root,root) %{py_sitedir}/systemd/login.so
-
  %files -n bash-completion-systemd
  %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/bootctl
-%{_datadir}/bash-completion/completions/busctl
-%{_datadir}/bash-completion/completions/coredumpctl
-%{_datadir}/bash-completion/completions/hostnamectl
-%{_datadir}/bash-completion/completions/journalctl
-%{_datadir}/bash-completion/completions/kernel-install
-%{_datadir}/bash-completion/completions/localectl
-%{_datadir}/bash-completion/completions/loginctl
-%{_datadir}/bash-completion/completions/machinectl
-%{_datadir}/bash-completion/completions/systemctl
-%{_datadir}/bash-completion/completions/systemd-analyze
-%{_datadir}/bash-completion/completions/systemd-cat
-%{_datadir}/bash-completion/completions/systemd-cgls
-%{_datadir}/bash-completion/completions/systemd-cgtop
-%{_datadir}/bash-completion/completions/systemd-delta
-%{_datadir}/bash-completion/completions/systemd-detect-virt
-%{_datadir}/bash-completion/completions/systemd-nspawn
-%{_datadir}/bash-completion/completions/systemd-run
-%{_datadir}/bash-completion/completions/timedatectl
+%{bash_compdir}/bootctl
+%{bash_compdir}/busctl
+%{bash_compdir}/coredumpctl
+%{bash_compdir}/hostnamectl
+%{bash_compdir}/journalctl
+%{bash_compdir}/kernel-install
+%{bash_compdir}/localectl
+%{bash_compdir}/loginctl
+%{bash_compdir}/machinectl
+%{bash_compdir}/networkctl
+%{bash_compdir}/portablectl
+%{bash_compdir}/resolvectl
+%{bash_compdir}/systemctl
+%{bash_compdir}/systemd-analyze
+%{bash_compdir}/systemd-cat
+%{bash_compdir}/systemd-cgls
+%{bash_compdir}/systemd-cgtop
+%{bash_compdir}/systemd-delta
+%{bash_compdir}/systemd-detect-virt
+%{bash_compdir}/systemd-nspawn
+%{bash_compdir}/systemd-path
+%{bash_compdir}/systemd-resolve
+%{bash_compdir}/systemd-run
+%{bash_compdir}/timedatectl
  
  %files -n zsh-completion-systemd
  %defattr(644,root,root,755)
-%{_datadir}/zsh/site-functions/_bootctl
-%{_datadir}/zsh/site-functions/_coredumpctl
-%{_datadir}/zsh/site-functions/_hostnamectl
-%{_datadir}/zsh/site-functions/_journalctl
-%{_datadir}/zsh/site-functions/_kernel-install
-%{_datadir}/zsh/site-functions/_localectl
-%{_datadir}/zsh/site-functions/_loginctl
-%{_datadir}/zsh/site-functions/_machinectl
-%{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host
-%{_datadir}/zsh/site-functions/_sd_machines
-%{_datadir}/zsh/site-functions/_sd_outputmodes
-%{_datadir}/zsh/site-functions/_sd_unit_files
-%{_datadir}/zsh/site-functions/_systemctl
-%{_datadir}/zsh/site-functions/_systemd
-%{_datadir}/zsh/site-functions/_systemd-analyze
-%{_datadir}/zsh/site-functions/_systemd-delta
-%{_datadir}/zsh/site-functions/_systemd-inhibit
-%{_datadir}/zsh/site-functions/_systemd-nspawn
-%{_datadir}/zsh/site-functions/_systemd-run
-%{_datadir}/zsh/site-functions/_systemd-tmpfiles
-%{_datadir}/zsh/site-functions/_timedatectl
+%{zsh_compdir}/_bootctl
+%{zsh_compdir}/_busctl
+%{zsh_compdir}/_coredumpctl
+%{zsh_compdir}/_hostnamectl
+%{zsh_compdir}/_journalctl
+%{zsh_compdir}/_kernel-install
+%{zsh_compdir}/_localectl
+%{zsh_compdir}/_loginctl
+%{zsh_compdir}/_machinectl
+%{zsh_compdir}/_networkctl
+%{zsh_compdir}/_resolvectl
+%{zsh_compdir}/_sd_hosts_or_user_at_host
+%{zsh_compdir}/_sd_machines
+%{zsh_compdir}/_sd_outputmodes
+%{zsh_compdir}/_sd_unit_files
+%{zsh_compdir}/_systemctl
+%{zsh_compdir}/_systemd
+%{zsh_compdir}/_systemd-analyze
+%{zsh_compdir}/_systemd-delta
+%{zsh_compdir}/_systemd-inhibit
+%{zsh_compdir}/_systemd-nspawn
+%{zsh_compdir}/_systemd-run
+%{zsh_compdir}/_systemd-tmpfiles
+%{zsh_compdir}/_timedatectl
  
  %files -n udev
  %defattr(644,root,root,755)
@@ -1911,22 +2117,19 @@ fi
  %files -n udev-core
  %defattr(644,root,root,755)
  
-/usr/lib/udev
-
-%attr(755,root,root) /lib/udev/collect
+%{_prefix}/lib/udev
  
  %attr(755,root,root) /lib/udev/net_helper
  
  %attr(755,root,root) /lib/udev/ata_id
  %attr(755,root,root) /lib/udev/cdrom_id
+%attr(755,root,root) /lib/udev/fido_id
  %attr(755,root,root) /lib/udev/mtd_probe
  %attr(755,root,root) /lib/udev/scsi_id
  %attr(755,root,root) /lib/udev/v4l_id
  
  %attr(755,root,root) /lib/udev/udevd
  
-%attr(755,root,root) /lib/udev/accelerometer
-
  /lib/udev/hwdb.d/20-acpi-vendor.hwdb
  /lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
  /lib/udev/hwdb.d/20-net-ifname.hwdb
@@ -1937,15 +2140,21 @@ fi
  /lib/udev/hwdb.d/20-sdio-vendor-model.hwdb
  /lib/udev/hwdb.d/20-usb-classes.hwdb
  /lib/udev/hwdb.d/20-usb-vendor-model.hwdb
+/lib/udev/hwdb.d/20-vmbus-class.hwdb
+/lib/udev/hwdb.d/60-autosuspend-chromiumos.hwdb
+/lib/udev/hwdb.d/60-autosuspend.hwdb
  /lib/udev/hwdb.d/60-evdev.hwdb
+/lib/udev/hwdb.d/60-input-id.hwdb
  /lib/udev/hwdb.d/60-keyboard.hwdb
+/lib/udev/hwdb.d/60-sensor.hwdb
+/lib/udev/hwdb.d/70-joystick.hwdb
  /lib/udev/hwdb.d/70-mouse.hwdb
  /lib/udev/hwdb.d/70-pointingstick.hwdb
  /lib/udev/hwdb.d/70-touchpad.hwdb
  
-%attr(755,root,root) %{_sbindir}/start_udev
-%attr(755,root,root) %{_sbindir}/udevd
-%attr(755,root,root) %{_sbindir}/udevadm
+%attr(755,root,root) %{_rootsbindir}/start_udev
+%attr(755,root,root) %{_rootsbindir}/udevd
+%attr(755,root,root) %{_rootsbindir}/udevadm
  %attr(755,root,root) /bin/systemd-hwdb
  %attr(755,root,root) /bin/udevadm
  
@@ -1959,24 +2168,26 @@ fi
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-uinput.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-steam_controller.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
  
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
  
  # rules below are NOT supposed to be changed by users
-/lib/udev/rules.d/42-usb-hid-pm.rules
  /lib/udev/rules.d/50-udev-default.rules
+/lib/udev/rules.d/60-autosuspend.rules
  /lib/udev/rules.d/60-block.rules
  /lib/udev/rules.d/60-cdrom_id.rules
  /lib/udev/rules.d/60-drm.rules
  /lib/udev/rules.d/60-evdev.rules
+/lib/udev/rules.d/60-fido-id.rules
  /lib/udev/rules.d/60-persistent-alsa.rules
  /lib/udev/rules.d/60-persistent-input.rules
  /lib/udev/rules.d/60-persistent-storage.rules
  /lib/udev/rules.d/60-persistent-storage-tape.rules
  /lib/udev/rules.d/60-persistent-v4l.rules
  /lib/udev/rules.d/60-serial.rules
-/lib/udev/rules.d/61-accelerometer.rules
  /lib/udev/rules.d/64-btrfs.rules
  /lib/udev/rules.d/70-mouse.rules
  /lib/udev/rules.d/70-power-switch.rules
@@ -2002,36 +2213,17 @@ fi
  
  %files -n udev-devel
  %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libudev.so
+%attr(755,root,root) /%{_lib}/libudev.so
  %{_includedir}/libudev.h
  %{_pkgconfigdir}/libudev.pc
  %{_npkgconfigdir}/udev.pc
-
-%files -n udev-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/libudev
-
-%files -n udev-glib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
-%{_libdir}/girepository-1.0/GUdev-1.0.typelib
-
-%files -n udev-glib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so
-%{_includedir}/gudev-1.0
-%{_pkgconfigdir}/gudev-1.0.pc
-%{_datadir}/gir-1.0/GUdev-1.0.gir
-
-%files -n udev-glib-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gudev
+%{_mandir}/man3/libudev.3*
+%{_mandir}/man3/udev_*.3*
  
  %files -n bash-completion-udev
  %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/udevadm
+%{bash_compdir}/udevadm
  
  %files -n zsh-completion-udev
  %defattr(644,root,root,755)
-%{_datadir}/zsh/site-functions/_udevadm
+%{zsh_compdir}/_udevadm