Merge branch 'rpm-software-management:master' into 3502

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()

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

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})