From ca9a9a56c42fa1b11c3d1928277d4e99265ed021c7d711841a25e58e10ae59c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Apr 2024 14:11:45 +0000 Subject: [PATCH] Accepting request 1167819 from home:schubi2 - Added "Requires.private: libeconf" in order to build with static libeconf.a . OBS-URL: https://build.opensuse.org/request/show/1167819 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=558 --- static_lib.patch | 10 ++++++++++ util-linux.changes | 6 ++++++ util-linux.spec | 7 ++++--- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 static_lib.patch diff --git a/static_lib.patch b/static_lib.patch new file mode 100644 index 0000000..9b5d507 --- /dev/null +++ b/static_lib.patch @@ -0,0 +1,10 @@ +diff -ur org/libblkid/blkid.pc.in patch/libblkid/blkid.pc.in +--- org/libblkid/blkid.pc.in 2024-01-31 11:02:15.460811568 +0100 ++++ patch/libblkid/blkid.pc.in 2024-04-15 15:19:34.288703597 +0200 +@@ -6,5 +6,6 @@ + Name: blkid + Description: Block device id library + Version: @LIBBLKID_VERSION@ ++Requires.private: libeconf + Cflags: -I${includedir}/blkid + Libs: -L${libdir} -lblkid diff --git a/util-linux.changes b/util-linux.changes index 9781913..a4a3622 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 15 13:27:41 UTC 2024 - Stefan Schubert + +- Added "Requires.private: libeconf" in order to build with static + libeconf.a . + ------------------------------------------------------------------- Mon Apr 8 08:37:09 UTC 2024 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index 99e175e..ccf4b94 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -111,6 +111,7 @@ Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE util-linux-bash-completion-su-chsh-l.patch bsc1172427 -- Fix "su -s" bash completion. Patch3: util-linux-bash-completion-su-chsh-l.patch Patch4: skip-lsfd-tests-PR2888.patch +Patch5: static_lib.patch BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -118,7 +119,7 @@ BuildRequires: fdupes BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: libcap-ng-devel -BuildRequires: libeconf-devel +BuildRequires: libeconf-devel-static BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool @@ -131,7 +132,7 @@ BuildRequires: utempter-devel %endif BuildRequires: zlib-devel Requires(post): permissions -Requires(verify): permissions +Requires(verify):permissions # util-linux is part of VMInstall, but we can well build without it # Helps shorten a cycle and eliminate a bootstrap issue #!BuildIgnore: util-linux @@ -411,7 +412,7 @@ Summary: Tools for writing to TTYs License: BSD-3-Clause Requires(pre): group(tty) Requires(post): permissions -Requires(verify): permissions +Requires(verify):permissions Provides: util-linux:%{_bindir}/mesg Provides: util-linux:%{_bindir}/wall Provides: util-linux:%{_bindir}/write