This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 91d3c0568 MINIFICPP-2625 minifi.service should be in /usr/lib (rpm
package)
91d3c0568 is described below
commit 91d3c0568eff776e2470623ec68d67715b6949df
Author: Martin Zink <[email protected]>
AuthorDate: Tue Sep 9 20:17:16 2025 +0200
MINIFICPP-2625 minifi.service should be in /usr/lib (rpm package)
Closes #2025
Signed-off-by: Martin Zink <[email protected]>
---
CMakeLists.txt | 4 ++--
bin/CMakeLists.txt | 2 +-
packaging/rpm/expected-rpm-contents.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f6ea3354..b841b325a 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index bf91f535a..f1869fbdd 100644
--- a/bin/CMakeLists.txt
+++ b/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)
diff --git a/packaging/rpm/expected-rpm-contents.in
b/packaging/rpm/expected-rpm-contents.in
index a06884a8b..0dbb6968c 100644
--- a/packaging/rpm/expected-rpm-contents.in
+++ b/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
