'cryptsetup' bcond fixes

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 0017d75d9e89f2f824f54d4ea3fe948a564db848..5bf7c84c054b531213d4a28d6570d1e9a419ed99 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -39,7 +39,7 @@ 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:       187
-Release:       3
+Release:       4
 Epoch:         1
 License:       GPL v2+
 Group:         Base
@@ -79,6 +79,7 @@ Patch6:               udev-so.patch
 Patch7:                udev-uClibc.patch
 Patch8:                udev-ploop-rules.patch
 Patch9:                udevadm-in-sbin.patch
+Patch10:       net-rename-revert.patch
 # hack set to allow static udev build
 Patch100:      static-udev.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
@@ -564,6 +565,7 @@ initrd.
 %endif
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -970,7 +972,7 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-binfmt
 %attr(755,root,root) /lib/systemd/systemd-cgroups-agent
 %attr(755,root,root) /lib/systemd/systemd-coredump
-%attr(755,root,root) /lib/systemd/systemd-cryptsetup
+%{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup}
 %attr(755,root,root) /lib/systemd/systemd-fsck
 %attr(755,root,root) /lib/systemd/systemd-hostnamed
 %attr(755,root,root) /lib/systemd/systemd-initctl
@@ -1060,7 +1062,7 @@ fi
 %{_mandir}/man7/systemd.journal-fields.7*
 %{_mandir}/man7/systemd.special.7*
 %{_mandir}/man8/systemd-binfmt.8*
-%{_mandir}/man8/systemd-cryptsetup-generator.8*
+%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*}
 %{_mandir}/man8/systemd-fstab-generator.8*
 %{_mandir}/man8/systemd-getty-generator.8*
 %{_mandir}/man8/systemd-hostnamed.8*
@@ -1124,6 +1126,7 @@ fi
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
+%dir /lib/systemd/system-sleep
 %dir /lib/systemd/system-shutdown
 # Don't package the kernel.core_pattern setting until systemd-coredump
 # is a part of an actual systemd release and it's made clear how to
@@ -1182,8 +1185,8 @@ fi
 %{_mandir}/man8/systemd-ask-password-wall.path.8*
 %{_mandir}/man8/systemd-ask-password-wall.service.8*
 %{_mandir}/man8/systemd-binfmt.service.8*
-%{_mandir}/man8/systemd-cryptsetup.8*
-%{_mandir}/man8/systemd-cryptsetup@.service.8*
+%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup.8*}
+%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup@.service.8*}
 %{_mandir}/man8/systemd-fsck-root.service.8*
 %{_mandir}/man8/systemd-fsck@.service.8*
 %{_mandir}/man8/systemd-halt.service.8*