From cfa41ff6bb56b777dc8eb0e699a5c32ce2adc4eb97aa5ac72be57a3d33867318 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 21 Nov 2014 13:37:35 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=823 --- ...stemd-logind.service-set-Type-notify.patch | 27 ------------------- systemd-mini.changes | 8 ++++++ systemd-mini.spec | 3 --- systemd.changes | 8 ++++++ systemd.spec | 3 --- 5 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 0001-systemd-logind.service-set-Type-notify.patch diff --git a/0001-systemd-logind.service-set-Type-notify.patch b/0001-systemd-logind.service-set-Type-notify.patch deleted file mode 100644 index cf12f3c9..00000000 --- a/0001-systemd-logind.service-set-Type-notify.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a4962513c555fe3ac4b5bebf97a71701361a45b0 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Wed, 19 Nov 2014 08:13:34 -0500 -Subject: [PATCH] systemd-logind.service: set Type=notify - -The code already calls sd_notify("READY=1"), so we may as well take -advantage of the startup behavior in the unit. The same was done for -the journal in a87a38c20. ---- - units/systemd-logind.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git units/systemd-logind.service.in units/systemd-logind.service.in -index f087e99..b9fbc2c 100644 ---- units/systemd-logind.service.in -+++ units/systemd-logind.service.in -@@ -19,6 +19,7 @@ Wants=dbus.socket - After=dbus.socket - - [Service] -+Type=notify - ExecStart=@rootlibexecdir@/systemd-logind - Restart=always - RestartSec=0 --- -1.7.9.2 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 2513c5b2..c3fa60e5 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 21 13:35:40 UTC 2014 - werner@suse.de + +- Remove upstream patch + 0001-systemd-logind.service-set-Type-notify.patch + as systemd-logind.service is already from DBus type, compare with + upstream commit eab459bc0639b81b32735f36d3e929e4bfa2cb4b + ------------------------------------------------------------------- Thu Nov 20 13:45:28 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 807c3451..43deb2f4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1041,8 +1041,6 @@ Patch506: 0001-systemctl-let-list-units-unit-files-honour-type.patch # PATCH-FIX-UPSTREAM added at 2014/11/18 Patch507: 0002-systemctl-obey-state-in-list-unit-files.patch # PATCH-FIX-UPSTREAM added at 2014/11/20 -Patch508: 0001-systemd-logind.service-set-Type-notify.patch -# PATCH-FIX-UPSTREAM added at 2014/11/20 Patch509: 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch # PATCH-FIX-UPSTREAM added at 2014/11/20 Patch510: 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch @@ -1912,7 +1910,6 @@ cp %{SOURCE7} m4/ %patch505 -p0 %patch506 -p0 %patch507 -p0 -%patch508 -p0 %patch509 -p0 %patch510 -p0 diff --git a/systemd.changes b/systemd.changes index 2513c5b2..c3fa60e5 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 21 13:35:40 UTC 2014 - werner@suse.de + +- Remove upstream patch + 0001-systemd-logind.service-set-Type-notify.patch + as systemd-logind.service is already from DBus type, compare with + upstream commit eab459bc0639b81b32735f36d3e929e4bfa2cb4b + ------------------------------------------------------------------- Thu Nov 20 13:45:28 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index ac8e83e6..a8ae7b75 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1036,8 +1036,6 @@ Patch506: 0001-systemctl-let-list-units-unit-files-honour-type.patch # PATCH-FIX-UPSTREAM added at 2014/11/18 Patch507: 0002-systemctl-obey-state-in-list-unit-files.patch # PATCH-FIX-UPSTREAM added at 2014/11/20 -Patch508: 0001-systemd-logind.service-set-Type-notify.patch -# PATCH-FIX-UPSTREAM added at 2014/11/20 Patch509: 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch # PATCH-FIX-UPSTREAM added at 2014/11/20 Patch510: 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch @@ -1907,7 +1905,6 @@ cp %{SOURCE7} m4/ %patch505 -p0 %patch506 -p0 %patch507 -p0 -%patch508 -p0 %patch509 -p0 %patch510 -p0