From c8508b94fa586d68143395067a9ba4bc56e0d061bc6fb5d4efd07013fa525007 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 18 Dec 2017 15:03:50 +0000 Subject: [PATCH] Accepting request 558188 from home:sbrabec:branches:util-linux-2.31-fix - Update bash completion conflict to cover rfkill file conflict. - Update changes. OBS-URL: https://build.opensuse.org/request/show/558188 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=355 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 4 ++-- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 4 ++-- util-linux.changes | 6 ++++++ util-linux.spec | 4 ++-- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 65cf296..53eb8c6 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com + +- Update bash completion conflict to cover rfkill file conflict. + ------------------------------------------------------------------- Mon Dec 4 17:28:04 CET 2017 - sbrabec@suse.com @@ -41,6 +46,7 @@ Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com libaudit. * Other bug fixes. - Drop upstreamed util-linux-use-tinfow.patch. +- Refreshed make-sure-sbin-resp-usr-sbin-are-in-PATH.diff. ------------------------------------------------------------------- Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de diff --git a/python-libmount.spec b/python-libmount.spec index 4f124a1..8d0305a 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -189,8 +189,8 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 %endif -# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-10 +# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. +Conflicts: bash-completion <= 2.7-1.3 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) Conflicts: systemd-presets-branding < 12.2 # bnc#805684: diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 65cf296..53eb8c6 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com + +- Update bash completion conflict to cover rfkill file conflict. + ------------------------------------------------------------------- Mon Dec 4 17:28:04 CET 2017 - sbrabec@suse.com @@ -41,6 +46,7 @@ Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com libaudit. * Other bug fixes. - Drop upstreamed util-linux-use-tinfow.patch. +- Refreshed make-sure-sbin-resp-usr-sbin-are-in-PATH.diff. ------------------------------------------------------------------- Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index d9dfdc2..c5be432 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -189,8 +189,8 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 %endif -# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-10 +# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. +Conflicts: bash-completion <= 2.7-1.3 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) Conflicts: systemd-presets-branding < 12.2 # bnc#805684: diff --git a/util-linux.changes b/util-linux.changes index 65cf296..53eb8c6 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com + +- Update bash completion conflict to cover rfkill file conflict. + ------------------------------------------------------------------- Mon Dec 4 17:28:04 CET 2017 - sbrabec@suse.com @@ -41,6 +46,7 @@ Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com libaudit. * Other bug fixes. - Drop upstreamed util-linux-use-tinfow.patch. +- Refreshed make-sure-sbin-resp-usr-sbin-are-in-PATH.diff. ------------------------------------------------------------------- Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de diff --git a/util-linux.spec b/util-linux.spec index 077b899..19e2fcc 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -189,8 +189,8 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 %endif -# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-10 +# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. +Conflicts: bash-completion <= 2.7-1.3 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) Conflicts: systemd-presets-branding < 12.2 # bnc#805684: