since 240 /var/lib/systemd/timesync needs to be directory instead of symlink

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 132988136830746c587bf7ac1818a801e376e2a7..bad19a1fe338cb2425282fb856dc92fc87e63f8f 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -28,14 +28,14 @@ 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:       241
-Release:       1
+Version:       242
+Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 #Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: c5953c24c850b44fcf714326e567dc37
+# Source0-md5: 5e004a4007cebbc4c7a06bfd2b9b3d4c
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -68,6 +68,7 @@ Patch3:               tmpfiles-not-fatal.patch
 Patch4:                udev-ploop-rules.patch
 Patch5:                udevadm-in-sbin.patch
 Patch6:                net-rename-revert.patch
+Patch7:                %{name}-completion.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
@@ -663,6 +664,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch5 -p1
 # rejected upstream (do not disable!)
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -847,11 +849,6 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 # Create directory for service helper scripts
 install -d $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d
 
-# to be enabled only when the packages are installed
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants/systemd-networkd.service \
-       $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
@@ -1006,6 +1003,11 @@ if [ -L /etc/systemd/system/getty.target.wants/getty@.service ] ; then
        rm -f /etc/systemd/system/getty.target.wants/getty@.service || :
 fi
 
+%triggerpostun units -- systemd-units < 1:242
+if [ -L /var/lib/systemd/timesync ] ; then
+       rm -f /var/lib/systemd/timesync || :
+fi
+
 %post inetd
 %systemd_reload
 # Do not change it to restart, we only want to start new services here
@@ -1124,14 +1126,7 @@ fi
 %dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/systemd/system/getty.target.wants
 %dir %{_sysconfdir}/systemd/system/multi-user.target.wants
-%dir %{_sysconfdir}/systemd/system/sockets.target.wants
-%dir %{_sysconfdir}/systemd/system/sysinit.target.wants
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/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
 %attr(755,root,root) /bin/journalctl
@@ -1244,6 +1239,7 @@ fi
 %{_prefix}/lib/environment.d/99-environment.conf
 %dir %{_prefix}/lib/kernel
 %dir %{_prefix}/lib/kernel/install.d
+%{_prefix}/lib/kernel/install.d/00-entry-directory.install
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %if %{with efi}
@@ -1734,6 +1730,7 @@ fi
 %{systemdunitdir}/swap.target
 %{systemdunitdir}/sysinit.target
 %{systemdunitdir}/system-update.target
+%{systemdunitdir}/time-set.target
 %{systemdunitdir}/time-sync.target
 %{systemdunitdir}/timers.target
 %{systemdunitdir}/umount.target
@@ -1765,7 +1762,6 @@ fi
 %{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/systemd-remount-fs.service
 %{systemdunitdir}/local-fs.target.wants/var-lock.mount
 %{systemdunitdir}/local-fs.target.wants/var-run.mount
 %{systemdunitdir}/machines.target.wants/var-lib-machines.mount
@@ -1895,12 +1891,9 @@ fi
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/networkd.conf
 %dir %{_sysconfdir}/systemd/network
-%dir %{_sysconfdir}/systemd/system/network-online.target.wants
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
 /lib/systemd/network/80-container-host0.network
 /lib/systemd/network/80-container-ve.network
 /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
@@ -1944,7 +1937,6 @@ fi
 %files resolved
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/resolved.conf
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/systemd/system/dbus-org.freedesktop.resolve1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
 %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
@@ -1993,7 +1985,7 @@ fi
 
 %files -n bash-completion-systemd
 %defattr(644,root,root,755)
-%{?with_efi:%{bash_compdir}/bootctl}
+%{bash_compdir}/bootctl
 %{bash_compdir}/busctl
 %{bash_compdir}/coredumpctl
 %{bash_compdir}/hostnamectl
@@ -2020,7 +2012,7 @@ fi
 
 %files -n zsh-completion-systemd
 %defattr(644,root,root,755)
-%{?with_efi:%{zsh_compdir}/_bootctl}
+%{zsh_compdir}/_bootctl
 %{zsh_compdir}/_busctl
 %{zsh_compdir}/_coredumpctl
 %{zsh_compdir}/_hostnamectl