sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 486182 from home:sbrabec:branches:util-linux-leap_42_3-merge-try2

Browse Source 
- 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
This commit is contained in:
Stanislav Brabec 2017-04-06 15:40:29 +00:00 committed by Git OBS Bridge
parent ad444d8ee0
commit 4c87942509
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-libmount.changes
View File

@ -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 Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com

2
python-libmount.spec
View File

@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 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). # 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) # 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 Conflicts: systemd-presets-branding < 12.2
# bnc#805684: # bnc#805684:

6
util-linux-systemd.changes
View File

@ -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 Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com

2
util-linux-systemd.spec
View File

@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 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). # 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) # 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 Conflicts: systemd-presets-branding < 12.2
# bnc#805684: # bnc#805684:

6
util-linux.changes
View File

@ -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 Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com

2
util-linux.spec
View File

@ -178,7 +178,7 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 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). # 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) # 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 Conflicts: systemd-presets-branding < 12.2
# bnc#805684: # bnc#805684: