- x32 rebuild

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 695d169538b03f4e5c60f1823fe45d80c23b5898..91433848ddb094b8cb10bc6982aa3ff11b6c2266 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,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:       208
-Release:       10
+Release:       13
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -62,6 +62,7 @@ Patch14:      dont-hash-null-keys.patch
 Patch15:       hibernate-to-file.patch
 Patch16:       systemd-configfs.patch
 Patch17:       pld-boot_efi_mount.patch
+Patch18:       optional-tmp-on-tmpfs.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -131,8 +132,6 @@ Provides:   group(systemd-journal)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
 Obsoletes:     systemd-no-compat-tmpfiles
 Obsoletes:     udev-systemd
-# systemd takes care of that and causes problems
-Conflicts:     binfmt-detector
 # sytemd wants pam with pam_systemd.so in system-auth...
 Conflicts:     pam < 1:1.1.5-5
 # ...and sudo hates it
@@ -261,6 +260,8 @@ Obsoletes:  readahead < 1:1.5.7-3
 Obsoletes:     virtual(init-daemon)
 Conflicts:     rc-scripts < 0.4.5.5-2
 Conflicts:     upstart
+# systemd takes care of that and causes problems
+Conflicts:     binfmt-detector
 
 %description init
 Install this package when you are ready to final switch to systemd.
@@ -596,6 +597,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -719,8 +721,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/var-run.mount
 ln -s ../var-lock.mount $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 ln -s ../var-run.mount $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 
-# and remove tmp on tmpfs mount
-%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/tmp.mount
+# 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.)