3
0
forked from pool/util-linux

Accepting request 502907 from openSUSE:Leap:15.0:Rings:0-Bootstrap

- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
  which wants to use a different release number scheme (lp150.x which produces
  lower numbers than the conflict).

to be discussed with @mlschroe

OBS-URL: https://build.opensuse.org/request/show/502907
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=342
This commit is contained in:
Marcus Meissner 2017-06-16 09:26:52 +00:00 committed by Git OBS Bridge
parent e6075974ba
commit b2cb9e6712
6 changed files with 29 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com

View File

@ -73,7 +73,7 @@ Name: python-libmount
%endif %endif
Summary: %main_summary Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %main_group Group: %group_pl
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -177,8 +177,10 @@ Obsoletes: login < 4.0-33.7
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%if 0%{?suse_version} < 1330
# 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
# 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-10 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)
@ -396,6 +398,7 @@ SMP systems.
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
Summary: %summary_pl Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl Group: %group_pl
%description -n python-libmount %description -n python-libmount

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com

View File

@ -177,8 +177,10 @@ Obsoletes: login < 4.0-33.7
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%if 0%{?suse_version} < 1330
# 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
# 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-10 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)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com

View File

@ -177,8 +177,10 @@ Obsoletes: login < 4.0-33.7
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%if 0%{?suse_version} < 1330
# 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
# 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-10 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)