1
0
forked from pool/util-linux

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
This commit is contained in:
Stanislav Brabec 2017-12-18 15:03:50 +00:00 committed by Git OBS Bridge
parent 8d036d9bf7
commit c8508b94fa
6 changed files with 24 additions and 6 deletions

View File

@ -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 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. libaudit.
* Other bug fixes. * Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch. - 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 Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

View File

@ -189,8 +189,8 @@ 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
%endif %endif
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). # rfkill conflicts of completion files with <= Leap 42.3 and < SLE15.
Conflicts: bash-completion <= 2.1-10 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) # 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:

View File

@ -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 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. libaudit.
* Other bug fixes. * Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch. - 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 Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

View File

@ -189,8 +189,8 @@ 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
%endif %endif
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). # rfkill conflicts of completion files with <= Leap 42.3 and < SLE15.
Conflicts: bash-completion <= 2.1-10 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) # 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:

View File

@ -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 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. libaudit.
* Other bug fixes. * Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch. - 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 Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

View File

@ -189,8 +189,8 @@ 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
%endif %endif
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). # rfkill conflicts of completion files with <= Leap 42.3 and < SLE15.
Conflicts: bash-completion <= 2.1-10 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) # 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: