From 0f2df16c2fb04f5672700d60c7eb50ce0a604fb64574a2b91be6ef8407f4b9b4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 6 Sep 2014 10:17:41 +0000 Subject: [PATCH] Accepting request 247547 from Base:System - Disable patch module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch for SLES-12 as well as for openSUSE-13.2 (bnc#895087) - Disable patch module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch for SLES-12 as well as for openSUSE-13.2 (bnc#895087) OBS-URL: https://build.opensuse.org/request/show/247547 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=204 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 2 ++ systemd.changes | 7 +++++++ systemd.spec | 2 ++ 4 files changed, 18 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 33ae215..91d2b71 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de + +- Disable patch + module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch + for SLES-12 as well as for openSUSE-13.2 (bnc#895087) + ------------------------------------------------------------------- Tue Sep 2 12:56:47 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 3f55c4d..edaeef3 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1206,7 +1206,9 @@ cp %{SOURCE7} m4/ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%if 0%{?suse_version} <= 1310 %patch8 -p1 +%endif %patch9 -p1 %patch12 -p1 %patch13 -p0 diff --git a/systemd.changes b/systemd.changes index 33ae215..91d2b71 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de + +- Disable patch + module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch + for SLES-12 as well as for openSUSE-13.2 (bnc#895087) + ------------------------------------------------------------------- Tue Sep 2 12:56:47 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index 2c4dca4..92f2030 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1201,7 +1201,9 @@ cp %{SOURCE7} m4/ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%if 0%{?suse_version} <= 1310 %patch8 -p1 +%endif %patch9 -p1 %patch12 -p1 %patch13 -p0