From 15f40b602e9c2e2220e60b9176d077821b3ecd56b6f7bae7a42e048c8a311566 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 2 May 2016 22:32:08 +0000 Subject: [PATCH] Accepting request 393319 from home:sbrabec:branches:util-linux-bsc977259 - Add librtas-devel to BuildRequires on Power platforms. Needed for proper function of lscpu (bsc#975082). Also add Conflicts to bash-completion change. OBS-URL: https://build.opensuse.org/request/show/393319 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=306 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 5 +++++ util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 5 +++++ util-linux.changes | 6 ++++++ util-linux.spec | 5 +++++ 6 files changed, 33 insertions(+) diff --git a/python-libmount.changes b/python-libmount.changes index d711a89..302d6f4 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index 59d4ee1..88695ca 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.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 # bnc#805684: %ifarch s390x Obsoletes: s390-32 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index d711a89..302d6f4 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index a182243..7a96495 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.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 # bnc#805684: %ifarch s390x Obsoletes: s390-32 diff --git a/util-linux.changes b/util-linux.changes index d711a89..302d6f4 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 78a10de..608f8cd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.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 # bnc#805684: %ifarch s390x Obsoletes: s390-32