summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-22 17:37:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-22 17:37:04 +0300
commit70b226d96698502281cd93581d68f013dd1865bf (patch)
tree3dd1775c45a0295ca15818c67a9d98e6ba1f4502 /support-files
parentabeacb9c8280416ee0bf91f4bda414430a565ad5 (diff)
parent3bcda8ad5f69538379ef0fed7715f23c1cf04380 (diff)
downloadmariadb-git-70b226d96698502281cd93581d68f013dd1865bf.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'support-files')
-rw-r--r--support-files/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 18ef364278f..749964284c4 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -78,8 +78,9 @@ IF(UNIX)
INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles)
ENDFOREACH()
IF(RPM)
- EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}-%{RELEASE}" libsepol OUTPUT_VARIABLE LIBSEPOL_VERSION)
- IF (LIBSEPOL_VERSION)
+ EXECUTE_PROCESS(COMMAND rpm -q --qf "%{VERSION}-%{RELEASE}" libsepol
+ OUTPUT_VARIABLE LIBSEPOL_VERSION RESULT_VARIABLE err)
+ IF (NOT err)
SET(CPACK_RPM_server_PACKAGE_REQUIRES
"${CPACK_RPM_server_PACKAGE_REQUIRES} libsepol >= ${LIBSEPOL_VERSION}"
PARENT_SCOPE)