X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=systemd.spec;h=e1f557425831c4f465216d14bcca291d24afd1c5;hb=acd853888198d6083e5f470cd70009356343973a;hp=845e9bba0cd038e8b79d6fb45e999c85bc0a3f63;hpb=5ad7745fe63cadf3940ba00da430c326191947f9;p=packages%2Fsystemd.git

diff --git a/systemd.spec b/systemd.spec
index 845e9bb..e1f5574 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -9,18 +9,19 @@
 %bcond_without	qrencode	# QRencode support
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
+%bcond_with	tests		# "make check" (requires systemd already installed)
 
 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:	198
-Release:	5
+Version:	206
+Release:	2
 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:	26a75e2a310f8c1c1ea9ec26ddb171c5
+# Source0-md5:	89e36f2d3ba963020b72738549954cbc
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	network.service
@@ -56,8 +57,8 @@ Patch8:		udev-ploop-rules.patch
 Patch9:		udevadm-in-sbin.patch
 Patch10:	net-rename-revert.patch
 Patch11:	nss-in-rootlib.patch
-Patch12:	systemctl-path.patch
-Patch13:	proc-hidepid.patch
+Patch12:	proc-hidepid.patch
+Patch13:	nss-myhostname-link.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -65,7 +66,7 @@ BuildRequires:	attr-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.4.3}
+%{?with_cryptsetup:BuildRequires:	cryptsetup-devel >= 1.6.0}
 BuildRequires:	dbus-devel >= 1.3.2
 BuildRequires:	docbook-style-xsl
 BuildRequires:	glib2-devel >= 1:2.22.0
@@ -74,7 +75,7 @@ BuildRequires:	gobject-introspection-devel >= 1.31.1
 BuildRequires:	gperf
 BuildRequires:	gtk-doc >= 1.18
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	kmod-devel >= 5
+BuildRequires:	kmod-devel >= 14
 BuildRequires:	libblkid-devel >= 2.20
 BuildRequires:	libcap-devel
 BuildRequires:	libgcrypt-devel >= 1.4.5
@@ -92,6 +93,7 @@ BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.628
 BuildRequires:	sed >= 4.0
+%{?with_tests:BuildRequires:	systemd}
 BuildRequires:	usbutils >= 0.82
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
@@ -106,18 +108,19 @@ Requires(pre):	/usr/sbin/useradd
 Requires:	/etc/os-release
 Requires:	SysVinit-tools
 Requires:	agetty
-%{?with_cryptsetup:Requires:	cryptsetup >= 1.4.3}
+%{?with_cryptsetup:Requires:	cryptsetup >= 1.6.0}
 Requires:	dbus >= 1.4.16-6
 Requires:	filesystem >= 4.0-3
+Requires:	kmod >= 14
 Requires:	libutempter
+Requires:	polkit
 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:	virtual(module-tools)
+Requires:	uname(release) >= 3.0
 Suggests:	ConsoleKit
 Suggests:	fsck >= 2.20
-Suggests:	kmod >= 5
 Suggests:	service(klogd)
 Suggests:	service(syslog)
 Provides:	group(systemd-journal)
@@ -254,6 +257,7 @@ Provides:	virtual(init-daemon)
 Obsoletes:	SysVinit
 Obsoletes:	readahead < 1:1.5.7-3
 Obsoletes:	virtual(init-daemon)
+Conflicts:	rc-scripts < 0.4.5.5-2
 Conflicts:	upstart
 
 %description init
@@ -349,6 +353,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}
+Obsoletes:	systemd-static
 
 %description devel
 Header files for systemd libraries.
@@ -356,18 +361,6 @@ Header files for systemd libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek systemd.
 
-%package static
-Summary:	Static systemd libraries
-Summary(pl.UTF-8):	Statyczne biblioteki systemd
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static systemd libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki systemd.
-
 %package -n bash-completion-systemd
 Summary:	bash-completion for systemd
 Summary(pl.UTF-8):	Bashowe dopełnianie składni dla systemd
@@ -412,18 +405,19 @@ Summary(pl.UTF-8):	Implementacja devfs w przestrzeni użytkownika - główna cz
 Group:		Base
 Requires:	coreutils
 Requires:	filesystem >= 3.0-45
-Requires:	kmod-libs >= 5
+Requires:	kmod >= 14
 Requires:	libblkid >= 2.20
 %{?with_selinux:Requires:	libselinux >= 2.1.9}
 Requires:	setup >= 2.6.1-1
 Requires:	udev-libs = %{epoch}:%{version}-%{release}
 Requires:	uname(release) >= 2.6.32
+#Suggests:	uname(release) >= 3.0
 Obsoletes:	udev-compat
 Obsoletes:	udev-initrd < %{epoch}:%{version}-%{release}}
+Conflicts:	geninitrd < 12639
 Conflicts:	rc-scripts < 0.4.5.3-1
 Conflicts:	systemd-units < 1:183
 Conflicts:	udev < 1:118-1
-Conflicts:	geninitrd < 12639
 
 %description -n udev-core
 A userspace implementation of devfs - core part of udev.
@@ -448,6 +442,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-static
 
 %description -n udev-devel
 Header file for libudev library.
@@ -455,18 +450,6 @@ Header file for libudev library.
 %description -n udev-devel -l pl.UTF-8
 Plik nagłówkowy biblioteki libudev.
 
-%package -n udev-static
-Summary:	Static libudev library
-Summary(pl.UTF-8):	Biblioteka statyczna libudev
-Group:		Development/Libraries
-Requires:	udev-devel = %{epoch}:%{version}-%{release}
-
-%description -n udev-static
-Static libudev library.
-
-%description -n udev-static -l pl.UTF-8
-Biblioteka statyczna libudev.
-
 %package -n udev-apidocs
 Summary:	libudev API documentation
 Summary(pl.UTF-8):	Dokumentacja API libudev
@@ -499,6 +482,7 @@ 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.
@@ -506,18 +490,6 @@ Header file for libgudev library.
 %description -n udev-glib-devel -l pl.UTF-8
 Plik nagłówkowy biblioteki libgudev.
 
-%package -n udev-glib-static
-Summary:	Static libgudev library
-Summary(pl.UTF-8):	Biblioteka statyczna libgudev
-Group:		Development/Libraries
-Requires:	udev-glib-devel = %{epoch}:%{version}-%{release}
-
-%description -n udev-glib-static
-Static libgudev library.
-
-%description -n udev-glib-static -l pl.UTF-8
-Biblioteka statyczna libgudev.
-
 %package -n udev-glib-apidocs
 Summary:	libgudev API documentation
 Summary(pl.UTF-8):	Dokumentacja API libgudev
@@ -570,13 +542,9 @@ Wiązania do Systemd dla Pythona.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
+#patch13 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
-%{__mv} units/initrd-cleanup.service{,.in}
-%{__mv} units/initrd-parse-etc.service{,.in}
-%{__mv} units/initrd-switch-root.service{,.in}
-
 %build
 %{__gtkdocize}
 %{__libtoolize}
@@ -602,7 +570,6 @@ cp -p %{SOURCE2} src/systemd_booted.c
 	--enable-gtk-doc \
 	--enable-introspection \
 	--enable-split-usr \
-	--enable-static \
 	--with-html-dir=%{_gtkdocdir} \
 	--with-kbd-loadkeys=/usr/bin/loadkeys \
 	--with-kbd-setfont=/bin/setfont \
@@ -616,6 +583,8 @@ cp -p %{SOURCE2} src/systemd_booted.c
 %{__make} -j1
 ./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/lib/%{name}/coredump \
@@ -632,8 +601,8 @@ ln -s /lib/udev/udevd $RPM_BUILD_ROOT/lib/systemd/systemd-udevd
 ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/udevd
 
 # compat symlinks for "/ merged into /usr" programs
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/udevadm
-ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/{,s}bin/udevadm
+ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT/bin
 ln -s /lib/udev $RPM_BUILD_ROOT/usr/lib/
 
 # install custom udev rules from pld package
@@ -709,7 +678,7 @@ ln -s ../pld-storage-init.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.targ
 ln -s ../pld-clean-tmp.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 
 # Install rc-inetd replacement
-cp -p %{SOURCE16} $RPM_BUILD_ROOT/lib/systemd/system-generators/pld-rc-inetd-generator
+cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdunitdir}-generators/pld-rc-inetd-generator
 cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/rc-inetd.service
 
 cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system-preset/default.preset
@@ -717,16 +686,19 @@ cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system-preset/default.pr
 cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/prefdm.service
 
 # handled by rc-local sysv service, no need for generator
-%{__rm} $RPM_BUILD_ROOT/lib/systemd/system-generators/systemd-rc-local-generator
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}-generators/systemd-rc-local-generator
 
 # provided by rc-scripts
-%{__rm} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
 
 # Make sure these directories are properly owned:
 #	- halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
 #	- syslog _might_ be used by some syslog implementation (none for now),
 #	- isn't dbus populated by dbus-systemd only (so to be moved there)?
-install -d $RPM_BUILD_ROOT%{systemdunitdir}/{dbus,halt,kexec,poweroff,reboot,syslog}.target.wants
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{basic,dbus,halt,initrd,kexec,poweroff,reboot,shutdown,syslog}.target.wants
+
+# Make sure the shutdown/sleep drop-in dirs exist
+install -d $RPM_BUILD_ROOT%{_libexecdir}/systemd/system-{shutdown,sleep}
 
 # 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}
@@ -906,6 +878,7 @@ fi
 /etc/dbus-1/system.d/org.freedesktop.hostname1.conf
 /etc/dbus-1/system.d/org.freedesktop.locale1.conf
 /etc/dbus-1/system.d/org.freedesktop.login1.conf
+/etc/dbus-1/system.d/org.freedesktop.machine1.conf
 /etc/dbus-1/system.d/org.freedesktop.systemd1.conf
 /etc/dbus-1/system.d/org.freedesktop.timedate1.conf
 %ghost %config(noreplace) %{_sysconfdir}/machine-id
@@ -926,6 +899,7 @@ fi
 /etc/xdg/systemd
 %attr(755,root,root) /bin/journalctl
 %attr(755,root,root) /bin/loginctl
+%attr(755,root,root) /bin/machinectl
 %attr(755,root,root) /bin/systemd
 %attr(755,root,root) /bin/systemd-ask-password
 %attr(755,root,root) /bin/systemd-inhibit
@@ -943,6 +917,7 @@ fi
 %attr(755,root,root) %{_bindir}/systemd-delta
 %attr(755,root,root) %{_bindir}/systemd-detect-virt
 %attr(755,root,root) %{_bindir}/systemd-nspawn
+%attr(755,root,root) %{_bindir}/systemd-run
 %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
 %attr(755,root,root) %{_bindir}/systemd-sysv-convert
 %attr(755,root,root) %{_bindir}/timedatectl
@@ -962,6 +937,7 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-journald
 %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-modules-load
 %attr(755,root,root) /lib/systemd/systemd-multi-seat-x
 %attr(755,root,root) /lib/systemd/systemd-quotacheck
@@ -979,7 +955,6 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-update-utmp
 %attr(755,root,root) /lib/systemd/systemd-user-sessions
 %attr(755,root,root) /lib/systemd/systemd-vconsole-setup
-%dir /lib/systemd/system-generators
 %attr(755,root,root) /lib/systemd/systemd
 %attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
 /lib/udev/rules.d/70-uaccess.rules
@@ -987,6 +962,8 @@ fi
 /lib/udev/rules.d/73-seat-late.rules
 /lib/udev/rules.d/99-systemd.rules
 %dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/system-shutdown
+%dir %{_libexecdir}/systemd/system-sleep
 %dir %{_libexecdir}/systemd/catalog
 %{_libexecdir}/systemd/catalog/systemd.catalog
 %{_libexecdir}/systemd/user
@@ -1003,6 +980,7 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
@@ -1017,6 +995,7 @@ fi
 %{_mandir}/man1/journalctl.1*
 %{_mandir}/man1/localectl.1*
 %{_mandir}/man1/loginctl.1*
+%{_mandir}/man1/machinectl.1*
 %{_mandir}/man1/systemd.1*
 %{_mandir}/man1/systemd-ask-password.1*
 %{_mandir}/man1/systemd-bootchart.1*
@@ -1030,6 +1009,7 @@ fi
 %{_mandir}/man1/systemd-machine-id-setup.1*
 %{_mandir}/man1/systemd-notify.1*
 %{_mandir}/man1/systemd-nspawn.1*
+%{_mandir}/man1/systemd-run.1*
 %{_mandir}/man1/systemd-tty-ask-password-agent.1*
 %{_mandir}/man1/timedatectl.1*
 %{_mandir}/man5/binfmt.d.5*
@@ -1047,6 +1027,7 @@ fi
 %{_mandir}/man5/os-release.5*
 %{_mandir}/man5/sysctl.d.5*
 %{_mandir}/man5/systemd.*.5*
+%{_mandir}/man5/systemd-sleep.conf.5*
 %{_mandir}/man5/systemd-system.conf.5*
 %{_mandir}/man5/systemd-user.conf.5*
 %{_mandir}/man5/vconsole.conf.5*
@@ -1072,6 +1053,7 @@ fi
 %{_mandir}/man8/systemd-journald.8*
 %{_mandir}/man8/systemd-localed.8*
 %{_mandir}/man8/systemd-logind.8*
+%{_mandir}/man8/systemd-machined.8*
 %{_mandir}/man8/systemd-modules-load.8*
 %{_mandir}/man8/systemd-quotacheck.8*
 %{_mandir}/man8/systemd-random-seed.8*
@@ -1107,10 +1089,11 @@ fi
 %attr(755,root,root) /sbin/runlevel
 %attr(755,root,root) /sbin/shutdown
 %attr(755,root,root) /sbin/telinit
-%{_mandir}/man1/init.1
+%{_mandir}/man1/init.1*
+%{_mandir}/man5/crypttab.5*
 %{_mandir}/man8/halt.8*
-%{_mandir}/man8/poweroff.8
-%{_mandir}/man8/reboot.8
+%{_mandir}/man8/poweroff.8*
+%{_mandir}/man8/reboot.8*
 %{_mandir}/man8/runlevel.8*
 %{_mandir}/man8/shutdown.8*
 %{_mandir}/man8/telinit.8*
@@ -1129,9 +1112,11 @@ fi
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
+%dir /lib/systemd/system-generators
 %dir /lib/systemd/system-sleep
 %dir /lib/systemd/system-shutdown
-%{_libexecdir}/sysctl.d/coredump.conf
+%{_libexecdir}/sysctl.d/50-coredump.conf
+%{_libexecdir}/sysctl.d/50-default.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -1144,6 +1129,7 @@ fi
 %{systemdunitdir}/*.mount
 %{systemdunitdir}/*.path
 %{systemdunitdir}/*.service
+%{systemdunitdir}/*.slice
 %exclude %{systemdunitdir}/rc-inetd.service
 %{systemdunitdir}/*.socket
 %{systemdunitdir}/*.target
@@ -1153,6 +1139,7 @@ fi
 %dir %{systemdunitdir}/final.target.wants
 %dir %{systemdunitdir}/graphical.target.wants
 %dir %{systemdunitdir}/halt.target.wants
+%dir %{systemdunitdir}/initrd.target.wants
 %dir %{systemdunitdir}/kexec.target.wants
 %dir %{systemdunitdir}/local-fs.target.wants
 %dir %{systemdunitdir}/multi-user.target.wants
@@ -1163,7 +1150,7 @@ fi
 %dir %{systemdunitdir}/sockets.target.wants
 %dir %{systemdunitdir}/sysinit.target.wants
 %dir %{systemdunitdir}/syslog.target.wants
-%{systemdunitdir}/basic.target.wants/*
+%dir %{systemdunitdir}/timers.target.wants
 %{systemdunitdir}/final.target.wants/*
 %{systemdunitdir}/graphical.target.wants/*
 %{systemdunitdir}/local-fs.target.wants/*
@@ -1173,14 +1160,15 @@ fi
 %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
 %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
 %{systemdunitdir}/runlevel[12345].target.wants/*
-%{systemdunitdir}/shutdown.target.wants/*
 %{systemdunitdir}/sockets.target.wants/*
 %{?with_cryptsetup:%{systemdunitdir}/sysinit.target.wants/cryptsetup.target}
 %{systemdunitdir}/sysinit.target.wants/dev-hugepages.mount
 %{systemdunitdir}/sysinit.target.wants/dev-mqueue.mount
+%{systemdunitdir}/sysinit.target.wants/kmod-static-nodes.service
 %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
 %{systemdunitdir}/sysinit.target.wants/sys-*.mount
 %{systemdunitdir}/sysinit.target.wants/systemd-*
+%{systemdunitdir}/timers.target.wants/*.timer
 %{_mandir}/man8/systemd-ask-password-console.path.8*
 %{_mandir}/man8/systemd-ask-password-console.service.8*
 %{_mandir}/man8/systemd-ask-password-wall.path.8*
@@ -1203,11 +1191,11 @@ fi
 %{_mandir}/man8/systemd-kexec.service.8*
 %{_mandir}/man8/systemd-localed.service.8*
 %{_mandir}/man8/systemd-logind.service.8*
+%{_mandir}/man8/systemd-machined.service.8*
 %{_mandir}/man8/systemd-modules-load.service.8*
 %{_mandir}/man8/systemd-poweroff.service.8*
 %{_mandir}/man8/systemd-quotacheck.service.8*
-%{_mandir}/man8/systemd-random-seed-load.service.8*
-%{_mandir}/man8/systemd-random-seed-save.service.8*
+%{_mandir}/man8/systemd-random-seed.service.8*
 %{_mandir}/man8/systemd-readahead-collect.service.8*
 %{_mandir}/man8/systemd-readahead-done.service.8*
 %{_mandir}/man8/systemd-readahead-done.timer.8*
@@ -1222,17 +1210,18 @@ fi
 %{_mandir}/man8/systemd-tmpfiles-clean.service.8*
 %{_mandir}/man8/systemd-tmpfiles-clean.timer.8*
 %{_mandir}/man8/systemd-tmpfiles-setup.service.8*
+%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8*
 %{_mandir}/man8/systemd-udevd.service.8*
 %{_mandir}/man8/systemd-udevd-control.socket.8*
 %{_mandir}/man8/systemd-udevd-kernel.socket.8*
 %{_mandir}/man8/systemd-update-utmp-runlevel.service.8*
-%{_mandir}/man8/systemd-update-utmp-shutdown.service.8*
+%{_mandir}/man8/systemd-update-utmp.service.8*
 %{_mandir}/man8/systemd-user-sessions.service.8*
 %{_mandir}/man8/systemd-vconsole-setup.service.8*
 
 %files inetd
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/systemd/system-generators/pld-rc-inetd-generator
+%attr(755,root,root) %{systemdunitdir}-generators/pld-rc-inetd-generator
 %{systemdunitdir}/rc-inetd.service
 
 %files analyze
@@ -1266,13 +1255,6 @@ fi
 %{_mandir}/man3/SD_*.3*
 %{_mandir}/man3/sd*.3*
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libsystemd-daemon.a
-%{_libdir}/libsystemd-id128.a
-%{_libdir}/libsystemd-journal.a
-%{_libdir}/libsystemd-login.a
-
 %files -n bash-completion-systemd
 %defattr(644,root,root,755)
 %{_datadir}/bash-completion/completions/hostnamectl
@@ -1280,6 +1262,7 @@ fi
 %{_datadir}/bash-completion/completions/localectl
 %{_datadir}/bash-completion/completions/loginctl
 %{_datadir}/bash-completion/completions/systemctl
+%{_datadir}/bash-completion/completions/systemd-analyze
 %{_datadir}/bash-completion/completions/systemd-coredumpctl
 %{_datadir}/bash-completion/completions/timedatectl
 
@@ -1296,8 +1279,6 @@ fi
 
 %attr(755,root,root) /lib/udev/collect
 
-%attr(755,root,root) /lib/udev/keyboard-force-release.sh
-
 %attr(755,root,root) /lib/udev/net_helper
 
 %attr(755,root,root) /lib/udev/ata_id
@@ -1308,26 +1289,22 @@ fi
 
 %attr(755,root,root) /lib/udev/udevd
 
-%attr(755,root,root) /lib/udev/keymap
-%dir /lib/udev/keymaps
-/lib/udev/keymaps/*
-
 %attr(755,root,root) /lib/udev/accelerometer
-%attr(755,root,root) /lib/udev/findkeyboards
 
 %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-pci-classes.hwdb
-/lib/udev/hwdb.d/20-pci-vendor-product.hwdb
+/lib/udev/hwdb.d/20-pci-vendor-model.hwdb
 /lib/udev/hwdb.d/20-usb-classes.hwdb
-/lib/udev/hwdb.d/20-usb-vendor-product.hwdb
+/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
+/lib/udev/hwdb.d/60-keyboard.hwdb
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
 %attr(755,root,root) %{_sbindir}/udevadm
-%attr(755,root,root) %{_bindir}/udevadm
+%attr(755,root,root) /bin/udevadm
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
@@ -1346,6 +1323,7 @@ fi
 /lib/udev/rules.d/42-usb-hid-pm.rules
 /lib/udev/rules.d/50-udev-default.rules
 /lib/udev/rules.d/60-cdrom_id.rules
+/lib/udev/rules.d/60-keyboard.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
@@ -1361,8 +1339,6 @@ fi
 /lib/udev/rules.d/78-sound-card.rules
 /lib/udev/rules.d/80-drivers.rules
 /lib/udev/rules.d/80-net-name-slot.rules
-/lib/udev/rules.d/95-keyboard-force-release.rules
-/lib/udev/rules.d/95-keymap.rules
 /lib/udev/rules.d/95-udev-late.rules
 
 %{_mandir}/man7/udev.7*
@@ -1381,10 +1357,6 @@ fi
 %{_pkgconfigdir}/libudev.pc
 %{_npkgconfigdir}/udev.pc
 
-%files -n udev-static
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libudev.a
-
 %files -n udev-apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libudev
@@ -1402,10 +1374,6 @@ fi
 %{_pkgconfigdir}/gudev-1.0.pc
 %{_datadir}/gir-1.0/GUdev-1.0.gir
 
-%files -n udev-glib-static
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.a
-
 %files -n udev-glib-apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gudev