From 8e9b187542f2a4b7d76090fd9996aa05b9c386cadcf0446fc646e27e9e97cf2f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 31 Jul 2014 07:48:41 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=744 --- systemd-mini.changes | 5 +++-- systemd-mini.spec | 2 +- systemd.changes | 3 ++- systemd.spec | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 148d3318..757a39cd 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Jul 30 21:10:32 UTC 2014 - jeffm@suse.com +Wed Jul 30 21:10:21 UTC 2014 - jeffm@suse.com - udev: use device mapper target name for btrfs device ready (bnc#888215). - Add udev-use-device-mapper-target-name-for-btrfs-device-ready.patch @@ -36,7 +36,8 @@ Wed Jul 30 11:02:27 UTC 2014 - werner@suse.de - Add former SUSE and/now upstream patches (bnc#889297) 1056-udevd-add-event-timeout-commandline-option.patch 1057-udev-unify-event-timeout-handling.patch - 1058-udev-unify-event-timeout-handling.patch (compatibility) + 1058-udev-unify-event-timeout-handling.patch (backport for + compatibility if patch 1022 is not applied) 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch ------------------------------------------------------------------- diff --git a/systemd-mini.spec b/systemd-mini.spec index 5ae6c6cf..9e34969a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1487,7 +1487,7 @@ cp %{SOURCE7} m4/ %patch1055 -p1 %endif %patch1056 -p0 -%if %{with blkrrpart} +%if %{with udevsettle} %patch1057 -p0 %else %patch1058 -p0 diff --git a/systemd.changes b/systemd.changes index 6676958e..757a39cd 100644 --- a/systemd.changes +++ b/systemd.changes @@ -36,7 +36,8 @@ Wed Jul 30 11:02:27 UTC 2014 - werner@suse.de - Add former SUSE and/now upstream patches (bnc#889297) 1056-udevd-add-event-timeout-commandline-option.patch 1057-udev-unify-event-timeout-handling.patch - 1058-udev-unify-event-timeout-handling.patch (compatibility) + 1058-udev-unify-event-timeout-handling.patch (backport for + compatibility if patch 1022 is not applied) 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch ------------------------------------------------------------------- diff --git a/systemd.spec b/systemd.spec index 96fa7a6c..a79eeb53 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1482,7 +1482,7 @@ cp %{SOURCE7} m4/ %patch1055 -p1 %endif %patch1056 -p0 -%if %{with blkrrpart} +%if %{with udevsettle} %patch1057 -p0 %else %patch1058 -p0