- added patch for ploop rules

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 57976bc10fb9add7e6426a7953cd6579bf440a3b..7d96fe8ff90fcf4439a9c4db93a61aed8b7cdce1 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,7 @@ Summary:      A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 Version:       44
-Release:       11
+Release:       14
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -28,7 +28,6 @@ Source0:      http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
-Source4:       compat-pld-media.tmpfiles
 Source5:       compat-pld-var-run.tmpfiles
 Source10:      pld-storage-init-late.service
 Source11:      pld-storage-init.service
@@ -43,6 +42,8 @@ Patch3:               pld-sysv-network.patch
 Patch4:                tmpfiles-not-fatal.patch
 Patch5:                CVE-2012-1174.patch
 Patch6:                ReleaseSession.patch
+Patch7:                control-subcgroup.patch
+Patch8:                kmsg-to-syslog.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -323,6 +324,8 @@ Force update of packages that provide tmpfiles.d configuration
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -385,7 +388,6 @@ ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/random.service
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/network.service
 
 # install compatibility tmpfiles configs
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
 
 # Install and enable storage subsystems support services (RAID, LVM, etc.)
@@ -628,7 +630,10 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
-%{_libexecdir}/sysctl.d/coredump.conf
+# 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
+# get the core dumps out of the journal.
+#%{_libexecdir}/sysctl.d/coredump.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -675,7 +680,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service
 %config(noreplace,missingok) %{systemdunitdir}/runlevel[12345].target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/shutdown.target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/sockets.target.wants/*
-%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/cryptsetup.target
+%{?with_cryptsetup:%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/cryptsetup.target}
 %config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/dev-hugepages.mount
 %config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/dev-mqueue.mount
 %config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount