- x32 rebuild

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index b4e9bcc1cd7301bf9f1042c45fa1afe5d59d74c8..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:       6
+Release:       13
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -60,6 +60,9 @@ Patch11:      nss-in-rootlib.patch
 Patch12:       proc-hidepid.patch
 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
@@ -129,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
@@ -259,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.
@@ -592,6 +595,9 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 # possible cause of infinite loop inside systemd-login
 #patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -715,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.)
@@ -831,7 +836,6 @@ if [ $1 -eq 1 ]; then
 
        # Enable the services we install by default.
        /bin/systemctl enable \
-               getty@.service \
                network.service \
                remote-fs.target \
                systemd-readahead-replay.service \
@@ -842,7 +846,6 @@ fi
 %preun units
 if [ $1 -eq 0 ] ; then
        /bin/systemctl disable \
-               getty@.service \
                network.service \
                remote-fs.target \
                systemd-readahead-replay.service \
@@ -885,6 +888,12 @@ if [ -f /etc/sysconfig/rpm ]; then
        fi
 fi
 
+%triggerpostun units -- systemd-units < 1:208-9
+# remove buggy symlink
+if [ -L /etc/systemd/system/getty.target.wants/getty@.service ] ; then
+       rm -f /etc/systemd/system/getty.target.wants/getty@.service || :
+fi
+
 %post inetd
 %systemd_reload
 # Do not change it to restart, we only want to start new services here
@@ -1044,13 +1053,8 @@ fi
 /lib/udev/rules.d/71-seat.rules
 /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
-%dir %{_libexecdir}/systemd/user-generators
 %{_libexecdir}/tmpfiles.d/legacy.conf
 %{_libexecdir}/tmpfiles.d/systemd.conf
 %{_libexecdir}/tmpfiles.d/tmp.conf
@@ -1197,11 +1201,18 @@ fi
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
+%{_libexecdir}/sysctl.d/50-default.conf
+%dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/system-shutdown
+%dir %{_libexecdir}/systemd/system-sleep
+%dir %{_libexecdir}/systemd/user
+%{_libexecdir}/systemd/user/*.target
+%{_libexecdir}/systemd/user/systemd-exit.service
+%dir %{_libexecdir}/systemd/user-generators
 %dir /lib/systemd/pld-helpers.d
 %dir /lib/systemd/system-generators
 %dir /lib/systemd/system-sleep
 %dir /lib/systemd/system-shutdown
-%{_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