From 0f9a19d787ce8bebd462863df3856c5d9f140a49a0462984703612a6f0dd7d6b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 30 Jan 2021 08:05:30 +0000 Subject: [PATCH] Accepting request 867613 from home:sbrabec:branches:distconfdir-fix - Do not require libeconf-devel on products without /usr/etc. OBS-URL: https://build.opensuse.org/request/show/867613 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=440 --- python3-libmount.changes | 5 +++++ python3-libmount.spec | 5 ++++- util-linux-systemd.changes | 5 +++++ util-linux-systemd.spec | 3 +++ util-linux.changes | 5 +++++ util-linux.spec | 3 +++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/python3-libmount.changes b/python3-libmount.changes index 8b59a87..3f3a83e 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 29 02:18:58 UTC 2021 - Stanislav Brabec + +- Do not require libeconf-devel on products without /usr/etc. + ------------------------------------------------------------------- Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel diff --git a/python3-libmount.spec b/python3-libmount.spec index 314c9b5..a95002c 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -79,13 +79,16 @@ Name: python3-libmount %endif Summary: %main_summary License: GPL-2.0-or-later -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: libcap-ng-devel +# It should be %%if %%{defined no_config}, but OBS cannot handle it: +%if 0%{?suse_version} >= 1550 BuildRequires: libeconf-devel +%endif BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 8b59a87..3f3a83e 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 29 02:18:58 UTC 2021 - Stanislav Brabec + +- Do not require libeconf-devel on products without /usr/etc. + ------------------------------------------------------------------- Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 50ca31f..e9bc9a5 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -85,7 +85,10 @@ BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: libcap-ng-devel +# It should be %%if %%{defined no_config}, but OBS cannot handle it: +%if 0%{?suse_version} >= 1550 BuildRequires: libeconf-devel +%endif BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool diff --git a/util-linux.changes b/util-linux.changes index 8b59a87..3f3a83e 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 29 02:18:58 UTC 2021 - Stanislav Brabec + +- Do not require libeconf-devel on products without /usr/etc. + ------------------------------------------------------------------- Mon Jan 25 17:07:55 UTC 2021 - Ludwig Nussel diff --git a/util-linux.spec b/util-linux.spec index 0a5f100..99d972e 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -85,7 +85,10 @@ BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: libcap-ng-devel +# It should be %%if %%{defined no_config}, but OBS cannot handle it: +%if 0%{?suse_version} >= 1550 BuildRequires: libeconf-devel +%endif BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool