From 4c879425091a1fad4afd0b6d7c716d07d40eaa44b5dfab05b78f2843b13d114e Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 6 Apr 2017 15:40:29 +0000 Subject: [PATCH] Accepting request 486182 from home:sbrabec:branches:util-linux-leap_42_3-merge-try2 - To cover release numbers of both SLE12 SP3 and Leap 42.3, relax release based conflict with bash-completion from 13.1 to 10. OBS-URL: https://build.opensuse.org/request/show/486182 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=337 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 2 +- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 2 +- util-linux.changes | 6 ++++++ util-linux.spec | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 4d4e5b2..6986fe5 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com + +- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax + release based conflict with bash-completion from 13.1 to 10. + ------------------------------------------------------------------- Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com diff --git a/python-libmount.spec b/python-libmount.spec index df5f0e1..3e87572 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-13.1 +Conflicts: bash-completion <= 2.1-10 # 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 4d4e5b2..6986fe5 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com + +- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax + release based conflict with bash-completion from 13.1 to 10. + ------------------------------------------------------------------- Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 12677dd..859954f 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-13.1 +Conflicts: bash-completion <= 2.1-10 # 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 4d4e5b2..6986fe5 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com + +- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax + release based conflict with bash-completion from 13.1 to 10. + ------------------------------------------------------------------- Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index 42b5806..69e570c 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). -Conflicts: bash-completion <= 2.1-13.1 +Conflicts: bash-completion <= 2.1-10 # 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: