MINIFICPP-2625 minifi.service should be in /usr/lib (rpm package)

Closes #2025

Signed-off-by: Martin Zink <martinzink@apache.org>

Author: martinzink

CMakeLists.txt

@@ -686,8 +686,8 @@ else()
         list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/var")
         list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/var/lib")
         list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/var/log")
-        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib64/systemd")
-        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib64/systemd/system")
+        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib/systemd")
+        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib/systemd/system")
     elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
         set(CPACK_GENERATOR "TGZ")
         set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 1)

bin/CMakeLists.txt

@@ -56,7 +56,7 @@ configure_file(
 )
 
 if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
-    install(FILES ${CMAKE_BINARY_DIR}/bin/minifi.service DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system COMPONENT bin)
+    install(FILES ${CMAKE_BINARY_DIR}/bin/minifi.service DESTINATION /usr/lib/systemd/system COMPONENT bin)
 elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
     install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/minifi.sh DESTINATION bin COMPONENT bin)
     if (APPLE)

packaging/rpm/expected-rpm-contents.in

@@ -15,7 +15,7 @@
 /usr/lib64/nifi-minifi-cpp/fips/fips.so
 /usr/lib64/nifi-minifi-cpp/fips/openssl
 /usr/lib64/nifi-minifi-cpp/libcore-minifi.so
-/usr/lib64/systemd/system/minifi.service
+/usr/lib/systemd/system/minifi.service
 /usr/share/doc/nifi-minifi-cpp
 /usr/share/doc/nifi-minifi-cpp/C2.md
 /usr/share/doc/nifi-minifi-cpp/CONAN.md