- fix lz4 build (would be better to fix via configure); update files

diff --git a/systemd-lz4.patch b/systemd-lz4.patch
new file mode 100644 (file)
index 0000000..f6a1721
--- /dev/null
+++ b/systemd-lz4.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 0b10fc7de7..1928e65bde 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
+ have_lz4=no
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
+ AS_IF([test "x$enable_lz4" != "xno"], [
+-        PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
+-               [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
++        PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
++               [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
+                 have_lz4=yes],
+-                have_lz4=no)
++                [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
++                      [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
++                      have_lz4=yes],
++                      have_lz4=no)])
+         AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
+               [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
+ ])

diff --git a/systemd.spec b/systemd.spec
index e65958593dcc65bdeb81a679a1f09f660171577e..906c578088ea30d2db9be7c1a3861915ade44162 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -68,7 +68,7 @@ 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
@@ -613,7 +613,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
@@ -632,6 +632,7 @@ cp -p %{SOURCE2} src/systemd_booted.c
 %{__automake}
 
 %configure \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/lz4" \
        QUOTAON=/sbin/quotaon \
        QUOTACHECK=/sbin/quotacheck \
        SETCAP=/sbin/setcap \
@@ -1065,7 +1066,9 @@ 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/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
@@ -1103,6 +1106,8 @@ fi
 %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
@@ -1265,6 +1270,7 @@ fi
 %{_mandir}/man5/binfmt.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*
@@ -1302,6 +1308,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*