From b2cb9e6712a188799bc9c947e6c04f537e92dfcdf543d25dd95b1c0cbff07dca Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 16 Jun 2017 09:26:52 +0000 Subject: [PATCH] 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 --- python-libmount.changes | 7 +++++++ python-libmount.spec | 5 ++++- util-linux-systemd.changes | 7 +++++++ util-linux-systemd.spec | 2 ++ util-linux.changes | 7 +++++++ util-linux.spec | 2 ++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/python-libmount.changes b/python-libmount.changes index 2c9f0dd..cd38ba1 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -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 diff --git a/python-libmount.spec b/python-libmount.spec index 622fb47..64dfae8 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -73,7 +73,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %main_group +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc 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). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 +%if 0%{?suse_version} < 1330 # 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 # 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 %package -n python-libmount Summary: %summary_pl +License: GPL-2.0+ Group: %group_pl %description -n python-libmount diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 2c9f0dd..cd38ba1 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -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 diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5dc3eda..0e53558 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -177,8 +177,10 @@ Obsoletes: login < 4.0-33.7 # 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. Conflicts: coreutils < 8.21 +%if 0%{?suse_version} < 1330 # 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 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) diff --git a/util-linux.changes b/util-linux.changes index 2c9f0dd..cd38ba1 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -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 diff --git a/util-linux.spec b/util-linux.spec index 8ca3b4d..ec98509 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -177,8 +177,10 @@ Obsoletes: login < 4.0-33.7 # 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. Conflicts: coreutils < 8.21 +%if 0%{?suse_version} < 1330 # 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 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)