X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=systemd.spec;h=e87c4ce3b3ffbc7a4ef5807bc7e08eea80ba6e29;hb=81437abca9d28055182e8c40519de78fdac5e975;hp=15e1a6ac075f9f07ab62ead04a923c2b91775809;hpb=5e012f76a2cd4ef1a0f433106a71b03236a85b3c;p=packages%2Fsystemd.git diff --git a/systemd.spec b/systemd.spec index 15e1a6a..e87c4ce 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,4 +1,5 @@ # TODO: +# - consider providing the factory files via appropriate packages (setup, pam) # - merge rpm macros provided by systemd with ours # - handle udev package removal: # - http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2014-March/023852.html @@ -6,50 +7,50 @@ # - dev->udev upgrade: # - /dev/urandom remains missing, not created with start_udev anymore # -# /usr/share/factory/etc/nsswitch.conf -# /usr/share/factory/etc/pam.d/other -# /usr/share/factory/etc/pam.d/system-auth -# # 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_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: 219 -Release: 1.1 +Version: 232 +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: e0d6c9a4b4f69f66932d2230298c9a34 +Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 3e3a0b14050eff62e68be72142181730 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 @@ -58,53 +59,52 @@ Source120: udev.blacklist Source121: fbdev.blacklist Patch0: target-pld.patch Patch1: config-pld.patch -Patch2: shut-sysv-up.patch -Patch3: pld-sysv-network.patch -Patch4: tmpfiles-not-fatal.patch -Patch8: udev-ploop-rules.patch -Patch9: udevadm-in-sbin.patch -Patch10: net-rename-revert.patch -Patch11: nss-in-rootlib.patch -Patch12: proc-hidepid.patch -Patch14: dont-hash-null-keys.patch -Patch16: systemd-configfs.patch -Patch17: pld-boot_efi_mount.patch -Patch18: optional-tmp-on-tmpfs.patch -Patch19: uids_gids.patch -Patch20: sysv-symlinks-warning.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: %{name}-lz4.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: pld-pam-systemd-user.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 %{?with_cryptsetup:BuildRequires: cryptsetup-devel >= 1.6.0} -BuildRequires: dbus-devel >= 1.3.2 +BuildRequires: dbus-devel >= 1.4.0 +BuildRequires: docbook-dtd45-xml BuildRequires: docbook-style-xsl -BuildRequires: elfutils-devel -BuildRequires: glib2-devel >= 1:2.22.0 +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: gtk-doc >= 1.18 BuildRequires: intltool >= 0.40.0 -BuildRequires: kmod-devel >= 14 +BuildRequires: kmod-devel >= 15 BuildRequires: libapparmor-devel -BuildRequires: libblkid-devel >= 2.20 +BuildRequires: libblkid-devel >= 2.24 BuildRequires: libcap-devel BuildRequires: libgcrypt-devel >= 1.4.5 +#BuildRequires: libidn-devel +#BuildRequires: liblzma-devel %{?with_microhttpd:BuildRequires: libmicrohttpd-devel >= 0.9.33} -BuildRequires: libmount-devel +BuildRequires: libmount-devel >= 2.28.2-2 BuildRequires: libseccomp-devel >= 1.0.0 %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9} BuildRequires: libtool >= 2:2.2 -%{?with_tcpd:BuildRequires: libwrap-devel} BuildRequires: libxslt-progs -BuildRequires: lz4-devel +BuildRequires: lz4-devel >= r119 BuildRequires: m4 -%{?with_pam:BuildRequires: pam-devel} +%{?with_pam:BuildRequires: pam-devel >= 1.1.2} BuildRequires: pkgconfig >= 0.9.0 BuildRequires: python-devel BuildRequires: python-lxml @@ -131,8 +131,9 @@ Requires: SysVinit-tools Requires: agetty %{?with_cryptsetup:Requires: cryptsetup >= 1.6.0} Requires: dbus >= 1.4.16-6 -Requires: filesystem >= 4.0-3 -Requires: kmod >= 14 +Requires: filesystem >= 4.0-39 +Requires: glibc >= 2.16 +Requires: kmod >= 15 %{?with_microhttpd:Requires: libmicrohttpd >= 0.9.33} Requires: libutempter Requires: polkit @@ -140,27 +141,32 @@ 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: util-linux >= 2.28.2-2 +Requires: uname(release) >= 3.12 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) +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-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: 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 @@ -168,8 +174,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 @@ -207,6 +213,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 @@ -292,6 +300,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. @@ -357,8 +367,8 @@ 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 resolved @@ -414,9 +424,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 @@ -449,6 +456,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 @@ -457,19 +465,6 @@ 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 @@ -532,13 +527,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 +Requires: kmod >= 15 +Requires: libblkid >= 2.24 %{?with_selinux:Requires: libselinux >= 2.1.9} 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.12 Obsoletes: udev-compat Obsoletes: udev-initrd < %{epoch}:%{version}-%{release}} Conflicts: geninitrd < 12639 @@ -569,6 +563,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 @@ -577,64 +572,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 @@ -670,77 +607,83 @@ Uzupełnianie parametrów w zsh dla poleceń udev. %setup -q %patch0 -p1 %patch1 -p1 -#patch2 -p1 +%patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +# rejected upstream (do not disable!) +%patch6 -p1 +%patch7 -p1 %patch8 -p1 %patch9 -p1 -# rejected upstream -#patch10 -p1 +%patch10 -p1 %patch11 -p1 %patch12 -p1 -# possible cause of infinite loop inside systemd-login -#patch14 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 +%patch13 -p1 +%patch14 -p1 + cp -p %{SOURCE2} src/systemd_booted.c %build -%{__gtkdocize} +%{__intltoolize} %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} + %configure \ + CPPFLAGS="%{rpmcppflags} -I/usr/include/lz4" \ 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}.cache \ +%endif %{?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} \ + --enable-split-usr \ --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-ntp-servers='0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org' \ --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-rootlibdir=/%{_lib} \ + --with-sysvinit-path=/etc/rc.d/init.d \ + --with-sysvrcnd-path=/etc/rc.d \ + --without-kill-user-processes + +%{__make} -%{__make} -j1 -./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon +./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd %{?with_tests:%{__make} check} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/var/lib/{%{name}/coredump,machines} \ +install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \ $RPM_BUILD_ROOT{%{_sysconfdir}/{modprobe.d,systemd/system-preset},%{_sbindir}} +install -d $RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants -%{__make} install \ +%{__make} -j1 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 # compatibility symlinks to udevd binary @@ -751,15 +694,16 @@ ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/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 /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 @@ -814,18 +758,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 @@ -854,7 +796,7 @@ install -d $RPM_BUILD_ROOT%{systemdunitdir}/{basic,dbus,halt,initrd,kexec,powero install -d $RPM_BUILD_ROOT%{_libexecdir}/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} @@ -863,20 +805,18 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} 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 +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-networkd.service \ + $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-networkd.socket \ + $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 +%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la \ + $RPM_BUILD_ROOT/lib/systemd/*.la \ + $RPM_BUILD_ROOT/%{_lib}/*.la %find_lang %{name} @@ -885,8 +825,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,14 +835,13 @@ 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 %post /bin/systemd-machine-id-setup || : /lib/systemd/systemd-random-seed save || : /bin/systemctl --system daemon-reexec || : /bin/journalctl --update-catalog || : -# Apply ACL to the journal directory -/bin/setfacl -Rnm g:logs:rx,d:g:logs:rx /var/log/journal || : %postun if [ $1 -ge 1 ]; then @@ -915,10 +852,14 @@ if [ "$1" = "0" ]; then %groupremove systemd-journal fi -%triggerpostun -- systemd < 208-1 +%triggerpostun -- systemd < 1:208-1 chgrp -R systemd-journal /var/log/journal chmod g+s /var/log/journal +%triggerpostun -- systemd < 1:220-1 +# 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 @@ -935,12 +876,14 @@ if [ $1 -eq 1 ]; then # And symlink what we found to the new-style default.target ln -s "$target" %{_sysconfdir}/systemd/system/default.target || : - # Setup hostname - [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network - if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then - [ -f /etc/hostname ] && mv -f /etc/hostname /etc/hostname.rpmsave - echo $HOSTNAME > /etc/hostname - chmod 644 /etc/hostname + # Setup hostname if not yet done so + if [ ! -s /etc/hostname ]; then + HOSTNAME= + [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network + if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then + echo $HOSTNAME > /etc/hostname + chmod 644 /etc/hostname + fi fi # Enable the services we install by default. @@ -1088,9 +1031,6 @@ 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 @@ -1101,13 +1041,12 @@ fi /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 +%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 %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 @@ -1123,9 +1062,11 @@ fi %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/ctrl-alt-del.target %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/machines.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 %attr(755,root,root) /bin/journalctl @@ -1151,27 +1092,30 @@ 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}/timedatectl /lib/systemd/import-pubring.gpg +/lib/systemd/resolv.conf +%attr(755,root,root) /lib/systemd/libsystemd-shared*.so %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-export %attr(755,root,root) /lib/systemd/systemd-fsck %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-importd %attr(755,root,root) /lib/systemd/systemd-initctl %attr(755,root,root) /lib/systemd/systemd-journald @@ -1182,17 +1126,14 @@ 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-shutdownd %attr(755,root,root) /lib/systemd/systemd-sleep %attr(755,root,root) /lib/systemd/systemd-socket-proxyd %attr(755,root,root) /lib/systemd/systemd-sysctl @@ -1206,13 +1147,14 @@ fi %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 +%dir /lib/systemd/network +/lib/systemd/network/99-default.link /lib/udev/rules.d/70-uaccess.rules /lib/udev/rules.d/71-seat.rules /lib/udev/rules.d/73-seat-late.rules @@ -1221,13 +1163,34 @@ fi %dir %{_libexecdir}/kernel/install.d %{_libexecdir}/kernel/install.d/50-depmod.install %{_libexecdir}/kernel/install.d/90-loaderentry.install +%if %{with efi} +%dir %{_libexecdir}/systemd/boot +%dir %{_libexecdir}/systemd/boot/efi +%ifarch %{ix86} +%{_libexecdir}/systemd/boot/efi/linuxia32.efi.stub +%{_libexecdir}/systemd/boot/efi/systemd-bootia32.efi +%endif +%ifarch %{x8664} x32 +%{_libexecdir}/systemd/boot/efi/linuxx64.efi.stub +%{_libexecdir}/systemd/boot/efi/systemd-bootx64.efi +%endif +%ifarch aarch64 +%{_libexecdir}/systemd/boot/efi/linuxaa64.efi.stub +%{_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(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 %{_libexecdir}/sysusers.d/systemd.conf @@ -1235,9 +1198,12 @@ fi %{_libexecdir}/sysusers.d/systemd-remote.conf %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 @@ -1264,6 +1230,9 @@ fi %{?with_microhttpd:%{_datadir}/systemd/gatewayd} %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map +%{_datadir}/factory/etc/nsswitch.conf +%{_datadir}/factory/etc/pam.d/other +%{_datadir}/factory/etc/pam.d/system-auth %{_mandir}/man1/bootctl.1* %{_mandir}/man1/busctl.1* %{_mandir}/man1/coredumpctl.1* @@ -1274,7 +1243,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* @@ -1284,20 +1252,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/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* %{_mandir}/man5/locale.conf.5* @@ -1328,6 +1303,7 @@ fi %{_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* @@ -1335,14 +1311,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* @@ -1350,6 +1324,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* @@ -1366,9 +1341,8 @@ 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-shutdownd.8* %{_mandir}/man8/systemd-sleep.8* %{_mandir}/man8/systemd-socket-proxyd.8* %{_mandir}/man8/systemd-sysctl.8* @@ -1385,10 +1359,12 @@ fi %{_mandir}/man8/systemd-update-utmp.8* %{_mandir}/man8/systemd-user-sessions.8* %{_mandir}/man8/systemd-vconsole-setup.8* -%dir /var/lib/machines +%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 @@ -1427,7 +1403,6 @@ 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 @@ -1437,6 +1412,7 @@ fi %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 @@ -1460,16 +1436,32 @@ fi %{_mandir}/man1/systemctl.1* %{_mandir}/man5/tmpfiles.d.5* %{_mandir}/man8/systemd-tmpfiles.8* -%{_pkgconfigdir}/systemd.pc +%{_npkgconfigdir}/systemd.pc -%{systemdunitdir}/proc-sys-fs-binfmt_misc.automount %{systemdunitdir}/dev-hugepages.mount %{systemdunitdir}/dev-mqueue.mount +%{systemdunitdir}/initrd-root-device.target +%{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}/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 %{systemdunitdir}/var-run.mount %{systemdunitdir}/systemd-ask-password-console.path @@ -1477,7 +1469,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 @@ -1502,21 +1493,18 @@ 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}/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-firstboot.service %{systemdunitdir}/systemd-fsck-root.service %{systemdunitdir}/systemd-fsck@.service @@ -1546,8 +1534,7 @@ fi %{systemdunitdir}/systemd-random-seed.service %{systemdunitdir}/systemd-reboot.service %{systemdunitdir}/systemd-remount-fs.service -%{systemdunitdir}/systemd-rfkill@.service -%{systemdunitdir}/systemd-shutdownd.service +%{systemdunitdir}/systemd-rfkill.service %{systemdunitdir}/systemd-suspend.service %{systemdunitdir}/systemd-sysctl.service %{systemdunitdir}/systemd-sysusers.service @@ -1565,7 +1552,6 @@ fi %{systemdunitdir}/systemd-user-sessions.service %{systemdunitdir}/systemd-vconsole-setup.service %{systemdunitdir}/user@.service -%{systemdunitdir}/-.slice %{systemdunitdir}/machine.slice %{systemdunitdir}/system.slice %{systemdunitdir}/user.slice @@ -1576,16 +1562,17 @@ fi %{systemdunitdir}/systemd-journald-audit.socket %{systemdunitdir}/systemd-journald-dev-log.socket %{systemdunitdir}/systemd-journald.socket -%{systemdunitdir}/systemd-shutdownd.socket %{systemdunitdir}/systemd-udevd-control.socket %{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}/graphical.target @@ -1637,7 +1624,10 @@ 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 %dir %{systemdunitdir}/halt.target.wants %dir %{systemdunitdir}/initrd.target.wants %dir %{systemdunitdir}/kexec.target.wants @@ -1645,33 +1635,43 @@ fi %dir %{systemdunitdir}/multi-user.target.wants %dir %{systemdunitdir}/poweroff.target.wants %dir %{systemdunitdir}/reboot.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}/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}/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}/runlevel1.target.wants/systemd-update-utmp-runlevel.service -%{systemdunitdir}/runlevel2.target.wants/systemd-update-utmp-runlevel.service -%{systemdunitdir}/runlevel3.target.wants/systemd-update-utmp-runlevel.service -%{systemdunitdir}/runlevel4.target.wants/systemd-update-utmp-runlevel.service -%{systemdunitdir}/runlevel5.target.wants/systemd-update-utmp-runlevel.service +%{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 %{systemdunitdir}/sockets.target.wants/systemd-journald.socket -%{systemdunitdir}/sockets.target.wants/systemd-shutdownd.socket %{systemdunitdir}/sockets.target.wants/systemd-udevd-control.socket %{systemdunitdir}/sockets.target.wants/systemd-udevd-kernel.socket %{?with_cryptsetup:%{systemdunitdir}/sysinit.target.wants/cryptsetup.target} @@ -1700,14 +1700,18 @@ 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/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-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* @@ -1720,6 +1724,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* @@ -1730,8 +1736,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-shutdownd.service.8* -%{_mandir}/man8/systemd-shutdownd.socket.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* @@ -1763,10 +1768,9 @@ fi %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 +/lib/systemd/network/80-container-vz.network %{systemdunitdir}/dbus-org.freedesktop.network1.service %{systemdunitdir}/systemd-networkd-wait-online.service %{systemdunitdir}/systemd-networkd.service @@ -1776,6 +1780,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* @@ -1806,46 +1812,25 @@ 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 +%{_mandir}/man8/libnss_resolve.so.2.8* +%{_mandir}/man8/libnss_systemd.so.2.8* +%{_mandir}/man8/nss-resolve.8* +%{_mandir}/man8/nss-systemd.8.gz %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 @@ -1857,6 +1842,7 @@ fi %{_datadir}/bash-completion/completions/localectl %{_datadir}/bash-completion/completions/loginctl %{_datadir}/bash-completion/completions/machinectl +%{_datadir}/bash-completion/completions/networkctl %{_datadir}/bash-completion/completions/systemctl %{_datadir}/bash-completion/completions/systemd-analyze %{_datadir}/bash-completion/completions/systemd-cat @@ -1865,12 +1851,15 @@ fi %{_datadir}/bash-completion/completions/systemd-delta %{_datadir}/bash-completion/completions/systemd-detect-virt %{_datadir}/bash-completion/completions/systemd-nspawn +%{_datadir}/bash-completion/completions/systemd-path +%{_datadir}/bash-completion/completions/systemd-resolve %{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/timedatectl %files -n zsh-completion-systemd %defattr(644,root,root,755) %{_datadir}/zsh/site-functions/_bootctl +%{_datadir}/zsh/site-functions/_busctl %{_datadir}/zsh/site-functions/_coredumpctl %{_datadir}/zsh/site-functions/_hostnamectl %{_datadir}/zsh/site-functions/_journalctl @@ -1888,6 +1877,7 @@ fi %{_datadir}/zsh/site-functions/_systemd-delta %{_datadir}/zsh/site-functions/_systemd-inhibit %{_datadir}/zsh/site-functions/_systemd-nspawn +%{_datadir}/zsh/site-functions/_systemd-resolve %{_datadir}/zsh/site-functions/_systemd-run %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl @@ -1901,7 +1891,7 @@ fi %files -n udev-core %defattr(644,root,root,755) -/usr/lib/udev +%{_prefix}/lib/udev %attr(755,root,root) /lib/udev/collect @@ -1915,21 +1905,20 @@ fi %attr(755,root,root) /lib/udev/udevd -%attr(755,root,root) /lib/udev/accelerometer - -%dir /lib/udev/hwdb.d -/lib/udev/hwdb.d/20-OUI.hwdb /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 +/lib/udev/hwdb.d/20-OUI.hwdb /lib/udev/hwdb.d/20-pci-classes.hwdb /lib/udev/hwdb.d/20-pci-vendor-model.hwdb /lib/udev/hwdb.d/20-sdio-classes.hwdb /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/60-evdev.hwdb /lib/udev/hwdb.d/60-keyboard.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 @@ -1948,35 +1937,34 @@ 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-block.rules /lib/udev/rules.d/60-cdrom_id.rules /lib/udev/rules.d/60-drm.rules -/lib/udev/rules.d/60-keyboard.rules +/lib/udev/rules.d/60-evdev.rules /lib/udev/rules.d/60-persistent-alsa.rules /lib/udev/rules.d/60-persistent-input.rules -/lib/udev/rules.d/60-persistent-serial.rules -/lib/udev/rules.d/60-persistent-storage-tape.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/61-accelerometer.rules +/lib/udev/rules.d/60-serial.rules /lib/udev/rules.d/64-btrfs.rules /lib/udev/rules.d/70-mouse.rules /lib/udev/rules.d/70-power-switch.rules /lib/udev/rules.d/70-touchpad.rules /lib/udev/rules.d/75-net-description.rules /lib/udev/rules.d/75-probe_mtd.rules -/lib/udev/rules.d/75-tty-description.rules /lib/udev/rules.d/78-sound-card.rules /lib/udev/rules.d/80-drivers.rules /lib/udev/rules.d/80-net-setup-link.rules /lib/udev/rules.d/90-vconsole.rules -/lib/udev/rules.d/95-udev-late.rules %{_mandir}/man5/udev.conf.5* %{_mandir}/man7/udev.7* @@ -1992,31 +1980,12 @@ 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)