From cae8ef521690ef07aa5664da2575e37126ee52cc Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 19 Dec 2024 11:54:54 +0800 Subject: [PATCH 1/2] Set RPM_PLUGINDIR in top level CMakeLists.txt We have in macros.in: %__plugindir @RPM_PLUGINDIR@ This means, if RPM_PLUGINDIR is not set, %__plugindir will be empty. This in turn results in error message when running 'dnf'. e.g., dnf --help >/dev/null error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body So we should move this directory setting into the top level CMakeLists.txt. Signed-off-by: Chen Qi --- CMakeLists.txt | 3 +++ plugins/CMakeLists.txt | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f58bc0f7f5..b7a064a22e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,6 +456,9 @@ if (ENABLE_PYTHON) add_subdirectory(python) endif() +set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins + CACHE PATH "rpm plugin directory") + if (ENABLE_PLUGINS) add_subdirectory(plugins) endif() diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index a44056fe3a..6e61a7c202 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -42,9 +42,6 @@ if (HAVE_UNSHARE) add_library(unshare MODULE unshare.c) endif() -set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins - CACHE PATH "rpm plugin directory") - get_property(plugins DIRECTORY PROPERTY BUILDSYSTEM_TARGETS) foreach(plugin ${plugins}) target_link_libraries(${plugin} PRIVATE librpmio librpm ${Intl_LIBRARIES}) From 5a5347037b371326793afcfe9f4ec9dfd1484b79 Mon Sep 17 00:00:00 2001 From: Raegan Durdin <139166552+rdurdin@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:14:31 -0500 Subject: [PATCH 2/2] Add missing documentation for attributes. (#3488) * Add missing documentation for attributes. --------- Co-authored-by: Raegan Durdin Co-authored-by: Florian Festi --- docs/man/rpm.8.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/man/rpm.8.md b/docs/man/rpm.8.md index 36b11f4b22..2f48fa486e 100644 --- a/docs/man/rpm.8.md +++ b/docs/man/rpm.8.md @@ -915,13 +915,15 @@ unique to verify mode are: The format of the output is a string of 9 characters, a possible attribute marker: - a %artifact a build side-effect file (such as buildid links) + a %artifact a build side-effect file (such as buildid links). c %config configuration file. d %doc documentation file. g %ghost file (i.e. the file contents are not included in the package payload). l %license license file. m %missingok file missing is not a verify failure. + n %%config(noreplace) (do not replace file). r %readme readme file. + s specfile in source package. from the package header, followed by the file name. Each of the 9 characters denotes the result of a comparison of attribute(s) of the