Skip to content

Commit aba8c76

Browse files
sanja-byelkingrooverdan
authored andcommitted
MDEV-40173 RPM conflicts on /usr/lib64/security
The move of the install location of pam files in MDEV-37197 (34aac09) resulted in different install locations on different RPM distros. Correct the RPM packaging to ignore the path of the pam files (but not the pam files themselves).
1 parent 52e5c0c commit aba8c76

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

cmake/cpack_rpm.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,8 @@ SET(ignored
155155
"%ignore /etc/systemd"
156156
"%ignore /etc/systemd/system"
157157
"%ignore /lib"
158-
"%ignore /lib/security"
159158
"%ignore /lib64"
160-
"%ignore /lib64/security"
159+
"%ignore ${INSTALL_PAMDIR_RPM}"
161160
"%ignore ${CMAKE_INSTALL_PREFIX}"
162161
"%ignore ${CMAKE_INSTALL_PREFIX}/bin"
163162
"%ignore ${CMAKE_INSTALL_PREFIX}/include"

0 commit comments

Comments
 (0)