From 9ae5124e0ddd716704a110efc0365f78113333a8cbad3913fbb000b2fe21e4cd Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 16 Sep 2020 00:36:58 +0000 Subject: [PATCH] Accepting request 834768 from home:sbrabec:branches:util-linux-multibuild Fix flavor names and cross provides. OBS-URL: https://build.opensuse.org/request/show/834768 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=434 --- _multibuild | 1 - util-linux.changes | 2 +- util-linux.spec | 35 +++++++++++++++++++++-------------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/_multibuild b/_multibuild index 0de1a23..b03821e 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,4 @@ mini - standard python diff --git a/util-linux.changes b/util-linux.changes index 407cd98..c419e96 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Sep 8 00:10:31 UTC 2020 - Stanislav Brabec +Wed Sep 16 00:10:11 UTC 2020 - Stanislav Brabec - Migrate multi-spec build to multibuild. - Change packaging from per-partes build to mini+full build. diff --git a/util-linux.spec b/util-linux.spec index bc1ebd3..6d9fe2c 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -27,7 +27,7 @@ %define group_pl Development/Languages/Python %global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "standard" +%if "%{flavor}" == "" %define main_summary %summary_ul %define main_group %group_ul %define psuffix %{nil} @@ -53,16 +53,6 @@ %bcond_without python %bcond_without systemd %endif -%if "%{flavor}" == "" -%define main_summary %summary_ul -%define main_group %group_ul -%define psuffix %{nil} -%bcond_without base -# All python flavors are build separately. No module can be built together with base. -# This is a limitation of %%python_subpackages. -%bcond_with python -%bcond_without systemd -%endif %if ! %{defined _distconfdir} %define _distconfdir %{_sysconfdir} @@ -143,9 +133,9 @@ Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Requires(pre): group(tty) %endif PreReq: %install_info_prereq permissions -%if "%{flavor}" == "standard" +%if "%{flavor}" == "" # We do not want to provide these in the "mini" package. -# If util-linux-mini is not explicitly wanted, ZYPP should always pick "standard" flavor. +# If util-linux-mini is not explicitly wanted, ZYPP should always pick "" flavor. Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} # bnc#651598: @@ -193,6 +183,7 @@ Recommends: which # Allows live build of packages using in BuildRequires: util-linux-mini. Provides: util-linux-mini = %{version} %else +Provides: util-linux = %{version} Conflicts: util-linux %endif %endif @@ -215,6 +206,7 @@ License: LGPL-2.1-or-later Group: System/Libraries %if "%{flavor}" == "mini" Conflicts: libblkid1 +Provides: libblkid1 = %{version} %else Provides: libblkid1-mini = %{version} %endif @@ -229,6 +221,7 @@ Group: Development/Libraries/C and C++ Requires: libblkid1%{psuffix} = %{version} %if "%{flavor}" == "mini" Conflicts: libblkid-devel +Provides: libblkid-devel = %{version} %else Provides: libblkid-mini-devel = %{version} %endif @@ -244,6 +237,7 @@ Group: Development/Libraries/C and C++ Requires: libblkid%{psuffix}-devel = %{version} %if "%{flavor}" == "mini" Conflicts: libblkid-devel-static +Provides: libblkid-devel-static = %{version} %else Provides: libblkid-mini-devel-static = %{version} %endif @@ -258,6 +252,7 @@ License: LGPL-2.1-or-later Group: System/Libraries %if "%{flavor}" == "mini" Conflicts: libfdisk1 +Provides: libfdisk1 = %{version} %else Provides: libfdisk1-mini = %{version} %endif @@ -272,6 +267,7 @@ Group: Development/Libraries/C and C++ Requires: libfdisk1%{psuffix} = %{version} %if "%{flavor}" == "mini" Conflicts: libfdisk-devel +Provides: libfdisk-devel = %{version} %else Provides: libfdisk-mini-devel = %{version} %endif @@ -287,6 +283,7 @@ Group: Development/Libraries/C and C++ Requires: libfdisk%{psuffix}-devel = %{version} %if "%{flavor}" == "mini" Conflicts: libfdisk-devel-static +Provides: libfdisk-devel-static = %{version} %else Provides: libfdisk-mini-devel-static = %{version} %endif @@ -301,6 +298,7 @@ License: LGPL-2.1-or-later Group: System/Libraries %if "%{flavor}" == "mini" Conflicts: libmount1 +Provides: libmount1 = %{version} %else Provides: libmount1-mini = %{version} %endif @@ -316,6 +314,7 @@ Group: Development/Libraries/C and C++ Requires: libmount1%{psuffix} = %{version} %if "%{flavor}" == "mini" Conflicts: libmount-devel +Provides: libmount-devel = %{version} %else Provides: libmount-mini-devel = %{version} %endif @@ -330,6 +329,7 @@ Group: Development/Libraries/C and C++ Requires: libmount%{psuffix}-devel = %{version} %if "%{flavor}" == "mini" Conflicts: libmount-devel-static +Provides: libmount-devel-static = %{version} %else Provides: libmount-mini-devel-static = %{version} %endif @@ -343,6 +343,7 @@ License: LGPL-2.1-or-later Group: System/Libraries %if "%{flavor}" == "mini" Conflicts: libsmartcols1 +Provides: libsmartcols1 = %{version} %else Provides: libsmartcols1-mini = %{version} %endif @@ -357,6 +358,7 @@ Group: Development/Libraries/C and C++ Requires: libsmartcols1%{psuffix} = %{version} %if "%{flavor}" == "mini" Conflicts: libsmartcols-devel +Provides: libsmartcols-devel = %{version} %else Provides: libsmartcols-mini-devel = %{version} %endif @@ -371,6 +373,7 @@ Group: Development/Libraries/C and C++ Requires: libsmartcols%{psuffix}-devel = %{version} %if "%{flavor}" == "mini" Conflicts: libsmartcols-devel-static +Provides: libsmartcols-devel-static = %{version} %else Provides: libsmartcols-mini-devel-static = %{version} %endif @@ -384,6 +387,7 @@ License: BSD-3-Clause Group: System/Libraries %if "%{flavor}" == "mini" Conflicts: libuuid1 +Provides: libuuid1 = %{version} %else Provides: libuuid1-mini = %{version} %endif @@ -398,6 +402,7 @@ Group: Development/Libraries/C and C++ Requires: libuuid1%{psuffix} = %{version} %if "%{flavor}" == "mini" Conflicts: libuuid-devel +Provides: libuuid-devel = %{version} %else Provides: libuuid-mini-devel = %{version} %endif @@ -413,6 +418,7 @@ Group: Development/Libraries/C and C++ Requires: libuuid%{psuffix}-devel = %{version} %if "%{flavor}" == "mini" Conflicts: libuuid-devel-static +Provides: libuuid-devel-static = %{version} %else Provides: libuuid-mini-devel-static = %{version} %endif @@ -436,6 +442,7 @@ Conflicts: util-linux < 2.25 %systemd_requires %if "%{flavor}" == "mini" Conflicts: uuidd +Provides: uuidd = %{version} %else Provides: uuidd-mini = %{version} %endif @@ -691,7 +698,7 @@ rm -r %{buildroot}{%{_bindir},%{_mandir},%{_datadir},%{_includedir},%{_libdir}/{ %check # Perform testsuite with the standard build only. -%if "%{flavor}" == "standard" +%if "%{flavor}" == "" # mark some tests "known_fail" # %if 0%{?qemu_user_space_build}