]> git.pld-linux.org Git - packages/systemd.git/blobdiff - systemd.spec
- partial update to 238; target-pld.patch hostname parsing needs testing; files secti...
[packages/systemd.git] / systemd.spec
index 3bc27ee641acc7e644e8663d03e3c9f84ab16751..ea7785501acf2783e2c6eb043b9caab7d68f5a40 100644 (file)
@@ -9,14 +9,12 @@
 #
 # Conditional build:
 %bcond_without audit           # audit support
-%bcond_without consoled        # systemd-consoled (embedded terminal)
 %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         # SELinux support
 %bcond_without efi             # EFI boot support
-%bcond_without python3         # Python 3.x support
 %bcond_with    tests           # "make check" (requires systemd already installed)
 
 %ifnarch %{ix86} %{x8664} aarch64
@@ -27,28 +25,26 @@ 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:       221
-Release:       12
+Version:       238
+Release:       0.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: b4d5a253841cf28a98b7ec99c45e3716
+Source0:       https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 76db8004647283b779234364cd637d3c
 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
@@ -68,71 +64,65 @@ 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}-glibc.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
 Patch11:       optional-tmp-on-tmpfs.patch
 Patch12:       uids_gids.patch
 Patch13:       sysctl.patch
-Patch14:       journal-gatewayd-fdopen.patch
+Patch14:       pld-pam-%{name}-user.patch
+Patch15:       %{name}-seccomp_disable_on_i386.patch
 URL:           http://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
+BuildRequires: bzip2-devel
+# ln --relative
+BuildRequires: coreutils >= 8.16
 %{?with_cryptsetup:BuildRequires:      cryptsetup-devel >= 1.6.0}
-BuildRequires: dbus-devel >= 1.3.2
+BuildRequires: curl-devel >= 7.32.0
+BuildRequires: dbus-devel >= 1.9.18
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
-BuildRequires: elfutils-devel
+BuildRequires: elfutils-devel >= 0.158
 BuildRequires: gettext-tools
 BuildRequires: glibc-misc
 %{?with_efi:BuildRequires:     gnu-efi}
 BuildRequires: gnutls-devel >= 3.1.4
-BuildRequires: gobject-introspection-devel >= 1.31.1
 BuildRequires: gperf
 BuildRequires: intltool >= 0.40.0
-BuildRequires: kmod-devel >= 14
+# pkgconfig(libiptc)
+BuildRequires: iptables-devel
+BuildRequires: kmod-devel >= 15
 BuildRequires: libapparmor-devel
-BuildRequires: libblkid-devel >= 2.20
+BuildRequires: libblkid-devel >= 2.24
 BuildRequires: libcap-devel
-%{?with_consoled:BuildRequires:        libdrm-devel >= 2.4}
-%{?with_consoled:BuildRequires:        libevdev-devel >= 1.2}
 BuildRequires: libgcrypt-devel >= 1.4.5
+BuildRequires: libgpg-error-devel >= 1.12
+BuildRequires: libidn-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.28.2-2
+BuildRequires: libseccomp-devel >= 2.3.1
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
-BuildRequires: lz4-devel
+BuildRequires: lz4-devel >= r125
 BuildRequires: m4
-%{?with_pam:BuildRequires:     pam-devel}
+BuildRequires: meson
+%{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
 BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: python-devel
-BuildRequires: python-lxml
-BuildRequires: python-modules
-%if %{with python3}
-BuildRequires: python3-devel
+BuildRequires: python3
 BuildRequires: python3-lxml
-BuildRequires: python3-modules
-BuildRequires: rpm-build >= 5.4.15-28
-%endif
 %{?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}
-%{?with_consoled:BuildRequires:        unifont-source}
 BuildRequires: usbutils >= 0.82
-%{?with_consoled:BuildRequires:        xorg-lib-libxkbcommon-devel >= 0.5}
+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}
+Requires(post,postun): %{name}-units = %{epoch}:%{version}-%{release}
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post):        /bin/setfacl
@@ -140,13 +130,19 @@ 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:      /etc/os-release
 Requires:      SysVinit-tools
 Requires:      agetty
 %{?with_cryptsetup:Requires:   cryptsetup >= 1.6.0}
-Requires:      dbus >= 1.4.16-6
+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 >= 15
+Requires:      libgpg-error >= 1.12
 %{?with_microhttpd:Requires:   libmicrohttpd >= 0.9.33}
 Requires:      libutempter
 Requires:      polkit
@@ -154,11 +150,13 @@ 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
+Requires:      uname(release) >= 3.13
+Requires:      util-linux >= 2.28.2-2
 Suggests:      fsck >= 2.25.0
 Suggests:      service(klogd)
 Suggests:      service(syslog)
-Provides:      group(systemd-bus-proxy)
+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)
@@ -166,7 +164,7 @@ Provides:   group(systemd-network)
 Provides:      group(systemd-resolve)
 Provides:      group(systemd-timesync)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
-Provides:      user(systemd-bus-proxy)
+Provides:      user(systemd-coredump)
 Provides:      user(systemd-journal-remote)
 Provides:      user(systemd-journal-upload)
 Provides:      user(systemd-network)
@@ -175,8 +173,12 @@ Provides:  user(systemd-timesync)
 # 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
@@ -184,8 +186,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
@@ -223,7 +225,7 @@ 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)
+# 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
@@ -272,7 +274,7 @@ Conflicts:  xl2tpd < 1.3.0-2
 # end of tmpfiles conflicts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sbindir        /sbin
+%define                _rootsbindir    /sbin
 %define                _libexecdir     %{_prefix}/lib
 
 %description
@@ -340,18 +342,6 @@ zarządcy systemu i usług systemd.
 Ten pakiet zawiera ogólną konfigurację, ustawienia można nadpisać
 poprzez katalog %{_sysconfdir}/systemd/system.
 
-%package consoled
-Summary:       Terminal support for systemd
-Summary(pl.UTF-8):     Obsługa terminala dla systemd
-Group:         Base
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description consoled
-Terminal support for systemd.
-
-%description consoled -l pl.UTF-8
-Obsługa terminala dla 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
@@ -464,7 +454,8 @@ 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.3.1
+%{?with_selinux:Requires:      libselinux >= 2.6}
 Obsoletes:     nss_myhostname
 
 %description libs
@@ -487,38 +478,13 @@ Header files for systemd libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek systemd.
 
-%package -n python-systemd
-Summary:       Systemd Python 2.x bindings
-Summary(pl.UTF-8):     Wiązania do Systemd dla Pythona 2.x
-Group:         Development/Languages/Python
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      python
-
-%description -n python-systemd
-Systemd Python 2.x bindings.
-
-%description -n python-systemd -l pl.UTF-8
-Wiązania do Systemd dla Pythona 2.x.
-
-%package -n python3-systemd
-Summary:       Systemd Python 3.x bindings
-Summary(pl.UTF-8):     Wiązania do Systemd dla Pythona 3.x
-Group:         Development/Languages/Python
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      python3
-
-%description -n python3-systemd
-Systemd Python 3.x bindings.
-
-%description -n python-systemd -l pl.UTF-8
-Wiązania do Systemd dla Pythona 3.x.
-
 %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
@@ -534,6 +500,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
@@ -575,13 +542,12 @@ 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:      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
@@ -670,84 +636,81 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-for PYTHON in %{__python} %{?with_python3:%{__python3}}; do
-
-%configure \
-       QUOTAON=/sbin/quotaon \
-       QUOTACHECK=/sbin/quotacheck \
-       SETCAP=/sbin/setcap \
-       KILL=/bin/kill \
-       KMOD=/sbin/kmod \
-       KEXEC=/sbin/kexec \
-       PYTHON="$PYTHON" \
-       PYTHON_BINARY="$PYTHON" \
-%if "%{?configure_cache}" == "1"
-       --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-$(basename $PYTHON).cache \
-%endif
-       %{?debug:--enable-debug} \
-       %{__enable_disable audit} \
-       %{__enable_disable cryptsetup libcryptsetup} \
-       %{__enable_disable efi gnuefi} \
-       %{__enable_disable pam} \
-       %{__enable_disable selinux} \
-       %{__enable_disable microhttpd} \
-       %{__enable_disable qrencode} \
-       --disable-silent-rules \
-       --enable-compat-libs \
-       --enable-lz4 \
-       --enable-split-usr \
-       %{?with_consoled:--enable-terminal} \
-       --with-kbd-loadkeys=/usr/bin/loadkeys \
-       --with-kbd-setfont=/bin/setfont \
-       --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} \
-       --with-sysvinit-path=/etc/rc.d/init.d \
-       --with-sysvrcnd-path=/etc/rc.d
-
-%{__make} clean-python
-
-%{__make}
-
-python_libs=.libs/$(basename $PYTHON)
-mkdir -p $python_libs
-cp -a .libs/{_daemon,_journal,_reader,id128,login}.so $python_libs
-done
-
-./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-kill-user-processes=false \
+       %{?debug:--buildtype=debug} \
+       -Defi=%{__true_false efi} \
+       -Dhalt-local=/sbin/halt.local \
+       -Dkexec-path=/sbin/kexec \
+       -Dkill-path=/bin/kill \
+       -Dkmod-path=/sbin/kmod \
+       -Dlibcryptsetup=%{__true_false cryptsetup} \
+       -Dloadkeys-path=/usr/bin/loadkeys \
+       -Dlz4=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="" \
+       -Drootsbindir=%{_rootsbindir} \
+       -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 -L. -lsystemd
+
+%{?with_tests:%meson_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
-       $RPM_BUILD_ROOT{%{_sysconfdir}/{modprobe.d,systemd/system-preset},%{_sbindir}}
+       $RPM_BUILD_ROOT{%{_sysconfdir}/{modprobe.d,systemd/system-preset},%{_rootsbindir}}
+install -d $RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants
 
-%{__make} -j1 install \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 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}/halt-local.service $RPM_BUILD_ROOT%{systemdunitdir}/final.target.wants/halt-local.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 %{_rootsbindir}/udevadm $RPM_BUILD_ROOT/bin
 ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib
 
 # install custom udev rules from pld package
@@ -764,7 +727,7 @@ 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
@@ -778,17 +741,6 @@ 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
@@ -812,18 +764,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
@@ -870,24 +820,6 @@ install -d $RPM_BUILD_ROOT/var/log
 :> $RPM_BUILD_ROOT/var/log/wtmp
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la \
-       $RPM_BUILD_ROOT/%{_lib}/libnss_myhostname.la \
-       $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%if %{with python3}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/systemd/*.la
-
-# install Python2 files, binaries built and saved earlier
-install -d $RPM_BUILD_ROOT%{py_sitedir}/systemd
-cp -a $RPM_BUILD_ROOT%{py3_sitedir}/systemd/*.py $RPM_BUILD_ROOT%{py_sitedir}/systemd
-install -p .libs/python2/*.so $RPM_BUILD_ROOT%{py_sitedir}/systemd
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%else
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/systemd/*.la
-%endif
-%py_postclean
-
 
 %find_lang %{name}
 
@@ -896,8 +828,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
@@ -908,6 +838,8 @@ 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 || :
@@ -921,6 +853,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
 
@@ -932,8 +876,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
@@ -1105,21 +1055,20 @@ fi
 
 %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
+%doc doc/DISTRO_PORTING 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
 %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}/vconsole.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/bootchart.conf
 %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
@@ -1136,7 +1085,10 @@ fi
 %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/multi-user.target.wants/machines.target
+%{?with_cryptsetup:%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/remote-cryptsetup.target}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
+
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/sysinit.target.wants/systemd-timesyncd.service
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/systemd-user
 /etc/xdg/systemd
@@ -1152,7 +1104,7 @@ 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
+%{?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
@@ -1163,24 +1115,26 @@ fi
 %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-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/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
 %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-hibernate-resume
@@ -1196,18 +1150,17 @@ 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-modules-load
 %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-timedated
 %attr(755,root,root) /lib/systemd/systemd-timesyncd
@@ -1216,22 +1169,28 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-update-done
 %attr(755,root,root) /lib/systemd/systemd-user-sessions
 %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
 %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/system-generators/systemd-cryptsetup-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-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
+%{_libexecdir}/environment.d/99-environment.conf
 %dir %{_libexecdir}/kernel
 %dir %{_libexecdir}/kernel/install.d
 %{_libexecdir}/kernel/install.d/50-depmod.install
@@ -1252,15 +1211,17 @@ fi
 %{_libexecdir}/systemd/boot/efi/systemd-bootaa64.efi
 %endif
 %endif
-%dir %{_libexecdir}/systemd/catalog
 %{_libexecdir}/systemd/catalog/systemd.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be@latin.catalog
+%lang(bg) %{_libexecdir}/systemd/catalog/systemd.bg.catalog
+%lang(de) %{_libexecdir}/systemd/catalog/systemd.de.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
+%lang(zh_CN) %{_libexecdir}/systemd/catalog/systemd.zh_CN.catalog
 %lang(zh_TW) %{_libexecdir}/systemd/catalog/systemd.zh_TW.catalog
 %dir %{_libexecdir}/sysusers.d
 %{_libexecdir}/sysusers.d/basic.conf
@@ -1270,13 +1231,11 @@ fi
 %endif
 %{_libexecdir}/tmpfiles.d/etc.conf
 %{_libexecdir}/tmpfiles.d/home.conf
+%{_libexecdir}/tmpfiles.d/journal-nocow.conf
 %{_libexecdir}/tmpfiles.d/legacy.conf
 %{_libexecdir}/tmpfiles.d/systemd.conf
 %{_libexecdir}/tmpfiles.d/systemd-nologin.conf
 %{_libexecdir}/tmpfiles.d/systemd-nspawn.conf
-%if %{with microhttpd}
-%{_libexecdir}/tmpfiles.d/systemd-remote.conf
-%endif
 %{_libexecdir}/tmpfiles.d/tmp.conf
 %{_libexecdir}/tmpfiles.d/var.conf
 %{_libexecdir}/tmpfiles.d/x11.conf
@@ -1296,6 +1255,7 @@ 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
@@ -1303,7 +1263,7 @@ fi
 %{_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*
@@ -1313,7 +1273,6 @@ 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*
@@ -1323,23 +1282,27 @@ fi
 %{_mandir}/man1/systemd-firstboot.1*
 %{_mandir}/man1/systemd-firstboot.service.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-resolve.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}/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*
 %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*
@@ -1368,9 +1331,11 @@ fi
 %{_mandir}/man7/file-hierarchy.7*
 %{_mandir}/man7/kernel-command-line.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.time.7*
 %{_mandir}/man8/kernel-install.8*
@@ -1378,14 +1343,12 @@ fi
 %{_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*
 %{_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*
@@ -1393,6 +1356,7 @@ fi
 %{_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.8*
@@ -1409,15 +1373,15 @@ fi
 %{_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-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-timedated.8*
 %{_mandir}/man8/systemd-timesyncd.8*
 %{_mandir}/man8/systemd-timesyncd.service.8*
@@ -1427,6 +1391,11 @@ fi
 %{_mandir}/man8/systemd-update-utmp.8*
 %{_mandir}/man8/systemd-user-sessions.8*
 %{_mandir}/man8/systemd-vconsole-setup.8*
+%{_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*
 %attr(700,root,root) %dir /var/lib/machines
 %dir /var/lib/%{name}
 %dir /var/lib/%{name}/coredump
@@ -1471,17 +1440,17 @@ 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}/environment.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
 %{_libexecdir}/sysctl.d/50-default.conf
 %dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/catalog
 %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/busnames.target
 %{_libexecdir}/systemd/user/default.target
 %{_libexecdir}/systemd/user/exit.target
 %{_libexecdir}/systemd/user/paths.target
@@ -1491,14 +1460,12 @@ fi
 %{_libexecdir}/systemd/user/sockets.target
 %{_libexecdir}/systemd/user/sound.target
 %{_libexecdir}/systemd/user/timers.target
-%{_libexecdir}/systemd/user/systemd-bus-proxyd.service
-%{_libexecdir}/systemd/user/systemd-bus-proxyd.socket
 %{_libexecdir}/systemd/user/systemd-exit.service
 %dir %{_libexecdir}/systemd/user-generators
-%{_libexecdir}/systemd/user-generators/systemd-dbus1-generator
+%dir %{_libexecdir}/systemd/user-environment-generators
+%attr(755,root,root) %{_libexecdir}/systemd/user-environment-generators/30-systemd-environment-d-generator
 %dir /lib/systemd/pld-helpers.d
 %dir /lib/systemd/system-generators
-%attr(755,root,root) /lib/systemd/system-generators/systemd-dbus1-generator
 %dir /lib/systemd/system-preset
 /lib/systemd/system-preset/90-systemd.preset
 %dir /lib/systemd/system-sleep
@@ -1508,25 +1475,23 @@ 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}/org.freedesktop.hostname1.busname
-%{systemdunitdir}/org.freedesktop.import1.busname
-%{systemdunitdir}/org.freedesktop.locale1.busname
-%{systemdunitdir}/org.freedesktop.login1.busname
-%{systemdunitdir}/org.freedesktop.machine1.busname
-%{systemdunitdir}/org.freedesktop.network1.busname
-%{systemdunitdir}/org.freedesktop.resolve1.busname
-%{systemdunitdir}/org.freedesktop.systemd1.busname
-%{systemdunitdir}/org.freedesktop.timedate1.busname
-%{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}/systemd-coredump@.service
+%{systemdunitdir}/systemd-coredump.socket
+%{systemdunitdir}/systemd-exit.service
+%{systemdunitdir}/systemd-rfkill.socket
 %{systemdunitdir}/tmp.mount
 %{systemdunitdir}/var-lib-machines.mount
 %{systemdunitdir}/var-lock.mount
@@ -1536,7 +1501,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
@@ -1561,22 +1525,19 @@ fi
 %{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}/sys-kernel-config.service
+%{systemdunitdir}/system-update-cleanup.service
 %{systemdunitdir}/systemd-ask-password-console.service
 %{systemdunitdir}/systemd-ask-password-wall.service
 %{systemdunitdir}/systemd-backlight@.service
 %{systemdunitdir}/systemd-binfmt.service
-%{systemdunitdir}/systemd-bootchart.service
-%{systemdunitdir}/systemd-bus-proxyd.service
 %{systemdunitdir}/systemd-firstboot.service
 %{systemdunitdir}/systemd-fsck-root.service
 %{systemdunitdir}/systemd-fsck@.service
@@ -1606,7 +1567,7 @@ 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-sysctl.service
 %{systemdunitdir}/systemd-sysusers.service
@@ -1623,14 +1584,13 @@ fi
 %{systemdunitdir}/systemd-update-utmp.service
 %{systemdunitdir}/systemd-user-sessions.service
 %{systemdunitdir}/systemd-vconsole-setup.service
+%{systemdunitdir}/systemd-volatile-root.service
 %{systemdunitdir}/user@.service
-%{systemdunitdir}/-.slice
 %{systemdunitdir}/machine.slice
-%{systemdunitdir}/system.slice
+#%{systemdunitdir}/system.slice
 %{systemdunitdir}/user.slice
 %exclude %{systemdunitdir}/rc-inetd.service
 %{systemdunitdir}/syslog.socket
-%{systemdunitdir}/systemd-bus-proxyd.socket
 %{systemdunitdir}/systemd-initctl.socket
 %{systemdunitdir}/systemd-journal-remote.socket
 %{systemdunitdir}/systemd-journald-audit.socket
@@ -1640,14 +1600,15 @@ fi
 %{systemdunitdir}/systemd-udevd-kernel.socket
 %{systemdunitdir}/basic.target
 %{systemdunitdir}/bluetooth.target
-%{systemdunitdir}/busnames.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
@@ -1672,6 +1633,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
@@ -1697,7 +1661,6 @@ fi
 %{systemdunitdir}/umount.target
 %{systemdunitdir}/systemd-tmpfiles-clean.timer
 %dir %{systemdunitdir}/basic.target.wants
-%dir %{systemdunitdir}/busnames.target.wants
 %dir %{systemdunitdir}/dbus.target.wants
 %dir %{systemdunitdir}/final.target.wants
 %dir %{systemdunitdir}/graphical.target.wants
@@ -1705,42 +1668,38 @@ fi
 %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}/sound.target.wants
+%dir %{systemdunitdir}/system-update.target.wants
+%dir %{systemdunitdir}/sigpwr.target.wants
 %dir %{systemdunitdir}/sockets.target.wants
 %dir %{systemdunitdir}/sysinit.target.wants
 %dir %{systemdunitdir}/syslog.target.wants
 %dir %{systemdunitdir}/timers.target.wants
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.hostname1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.import1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.locale1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.login1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.machine1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.network1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.resolve1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.systemd1.busname
-%{systemdunitdir}/busnames.target.wants/org.freedesktop.timedate1.busname
 %{systemdunitdir}/final.target.wants/halt-local.service
 %{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
@@ -1773,17 +1732,20 @@ 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}/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*
-%{_mandir}/man8/systemd-bus-proxyd.8*
-%{_mandir}/man8/systemd-bus-proxyd.socket.8
-%{_mandir}/man8/systemd-bus-proxyd@.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*
@@ -1796,6 +1758,8 @@ fi
 %{_mandir}/man8/systemd-initctl.socket.8*
 %{_mandir}/man8/systemd-journald.service.8*
 %{_mandir}/man8/systemd-journald.socket.8*
+%{_mandir}/man8/systemd-importd.service.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*
@@ -1806,6 +1770,7 @@ 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-sysctl.service.8*
 %{_mandir}/man8/systemd-timedated.service.8*
@@ -1821,16 +1786,6 @@ fi
 %{_mandir}/man8/systemd-user-sessions.service.8*
 %{_mandir}/man8/systemd-vconsole-setup.service.8*
 
-%if %{with consoled}
-%files consoled
-%defattr(644,root,root,755)
-%attr(755,root,root) /lib/systemd/systemd-consoled
-%{_libexecdir}/systemd/user/systemd-consoled.service
-%dir %{_libexecdir}/systemd/user/default.target.wants
-%{_libexecdir}/systemd/user/default.target.wants/systemd-consoled.service
-%{_datadir}/systemd/unifont-glyph-array.bin
-%endif
-
 %if %{with microhttpd}
 %files journal-gateway
 %defattr(644,root,root,755)
@@ -1843,13 +1798,14 @@ 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
 %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
 /lib/systemd/network/80-container-host0.network
 /lib/systemd/network/80-container-ve.network
-%{systemdunitdir}/dbus-org.freedesktop.network1.service
+/lib/systemd/network/80-container-vz.network
+/etc/systemd/system/dbus-org.freedesktop.network1.service
 %{systemdunitdir}/systemd-networkd-wait-online.service
 %{systemdunitdir}/systemd-networkd.service
 %{systemdunitdir}/systemd-networkd.socket
@@ -1858,6 +1814,8 @@ fi
 %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}/man8/systemd-networkd-wait-online.8*
 %{_mandir}/man8/systemd-networkd-wait-online.service.8*
 %{_mandir}/man8/systemd-networkd.8*
@@ -1866,9 +1824,9 @@ fi
 %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
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/systemd/system/dbus-org.freedesktop.resolve1.service
 %{systemdunitdir}/systemd-resolved.service
 %attr(755,root,root) /lib/systemd/systemd-resolved
 %{_mandir}/man5/resolved.conf.5*
 
 %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
-
-%if %{with python3}
-%files -n python3-systemd
-%defattr(644,root,root,755)
-%dir %{py3_sitedir}/systemd
-%{py3_sitedir}/systemd/*.py
-%dir %{py3_sitedir}/systemd/__pycache__
-%{py3_sitedir}/systemd/__pycache__/*.py[co]
-%attr(755,root,root) %{py3_sitedir}/systemd/_daemon.so
-%attr(755,root,root) %{py3_sitedir}/systemd/_journal.so
-%attr(755,root,root) %{py3_sitedir}/systemd/_reader.so
-%attr(755,root,root) %{py3_sitedir}/systemd/id128.so
-%attr(755,root,root) %{py3_sitedir}/systemd/login.so
-%endif
-
 %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
+%{?with_efi:%{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}/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
+%{?with_efi:%{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}/_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-resolve
+%{zsh_compdir}/_systemd-run
+%{zsh_compdir}/_systemd-tmpfiles
+%{zsh_compdir}/_timedatectl
 
 %files -n udev
 %defattr(644,root,root,755)
@@ -2011,8 +1941,6 @@ fi
 
 %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
@@ -2025,13 +1953,15 @@ fi
 /lib/udev/hwdb.d/20-usb-vendor-model.hwdb
 /lib/udev/hwdb.d/60-evdev.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
 
@@ -2052,7 +1982,6 @@ fi
 %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-block.rules
 /lib/udev/rules.d/60-cdrom_id.rules
@@ -2064,7 +1993,6 @@ fi
 /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
@@ -2090,7 +2018,7 @@ 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
@@ -2099,8 +2027,8 @@ fi
 
 %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
This page took 0.126883 seconds and 4 git commands to generate.