- rel 13

- revert /var/run, it causes systemd to fail at startup

Changed files:
    compat-pld-var-run.tmpfiles -> 1.2
    systemd.spec -> 1.98

diff --git a/compat-pld-var-run.tmpfiles b/compat-pld-var-run.tmpfiles
index c5e166f4fc6f34d03e207dc914f8f26eb44c02fb..208450329230c22cdb8857c9b4ac8663ff830f2c 100644 (file)
--- a/compat-pld-var-run.tmpfiles
+++ b/compat-pld-var-run.tmpfiles
@@ -86,7 +86,7 @@ d /var/run/p3scan 770 root mail -
 d /var/run/pam_mount 755 root root -
 d /var/run/pcscd 755 root root -
 d /var/run/pgpool 775 root pgpool -
-d /var/run/php 731 root http) %verify(not group mode -
+d /var/run/php 731 root http -
 d /var/run/pluto 755 root root -
 d /var/run/policyd 775 root policyd -
 d /var/run/PolicyKit 770 root polkituser -

diff --git a/systemd.spec b/systemd.spec
index fe7409de644812f345bdc621c186a99e7f5cc96d..c7e0a951bbbdaf50bc1e03be55f9d0132751ead7 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -11,7 +11,7 @@ Summary:      A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 Version:       38
-Release:       12
+Release:       13
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -249,12 +249,15 @@ install %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system/network.service
 
 # install compatibility tmpfiles configs
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+#install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
 
 # All wants links are created at %post to make sure they are not owned
 # and hence overriden by rpm if the user deletes them (missingok?)
 %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants
 
+# do not cover /var/run until packages need rpm-provided-only subdirectories
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system/local-fs.target.wants/var-run.mount
+
 # it is in rc-scripts pkg
 %{__rm} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service