diff --git a/uid_wrapper-fix-cmocka-1.1.6+-support.patch b/uid_wrapper-fix-cmocka-1.1.6+-support.patch new file mode 100644 index 0000000..58184b4 --- /dev/null +++ b/uid_wrapper-fix-cmocka-1.1.6+-support.patch @@ -0,0 +1,31 @@ +From 850f24c6366abda30bfd77734b90330b8809d306 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 635e86e..68e050e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c) + target_compile_options(uwrap_fake_socket_wrapper + PRIVATE +-- +2.39.2 + diff --git a/uid_wrapper.spec b/uid_wrapper.spec index 34c4847..3cc1bad 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -1,6 +1,6 @@ Name: uid_wrapper Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A wrapper for privilege separation License: GPLv3+ @@ -10,6 +10,8 @@ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc Source2: uid_wrapper.keyring +Patch0: uid_wrapper-fix-cmocka-1.1.6+-support.patch + BuildRequires: gcc BuildRequires: cmake BuildRequires: gnupg2 @@ -62,6 +64,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %{_mandir}/man1/uid_wrapper.1* %changelog +* Mon Feb 27 2023 Andreas Schneider - 1.3.0-3 +- Fix building with cmocka >= 1.1.6 + * Sat Jan 21 2023 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild