build stellar and stellar-devel rpm

4 files changed, 14 insertions, 21 deletions

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 33dba1a..15c789f 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,12 +1,4 @@
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_PACKAGE_NAME "stellar-debug")
-else()
-    set(CPACK_PACKAGE_NAME "stellar")
-endif()
-
-message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
-
-set(CPACK_PACKAGE_VENDOR "TSG")
+set(CPACK_PACKAGE_VENDOR "TSG")
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${DESCRIBE}")
@@ -19,17 +11,23 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
 set(CPACK_RPM_DEBUGINFO_PACKAGE on)
-set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
-set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
-set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
-
-# Must uninstall the debug package before install release package
+set(CPACK_RPM_COMPONENT_INSTALL ON)
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CPACK_RPM_PACKAGE_CONFLICTS "stellar")
+    set(CPACK_RPM_PROGRAM_PACKAGE_NAME "stellar-debug")
+    set(CPACK_RPM_LIBRARIES_PACKAGE_NAME "stellar-devel-debug")
 else()
-    set(CPACK_RPM_PACKAGE_CONFLICTS "stellar-debug")
+    set(CPACK_RPM_PROGRAM_PACKAGE_NAME "stellar")
+    set(CPACK_RPM_LIBRARIES_PACKAGE_NAME "stellar-devel")
 endif()
 
+set(CPACK_COMPONENT_PROGRAM_REQUIRED TRUE)
+set(CPACK_RPM_PROGRAM_PACKAGE_CONFLICTS ${CPACK_RPM_PROGRAM_PACKAGE_NAME})
+
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
+set(CPACK_RPM_LIBRARIES_PACKAGE_CONFLICTS ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
+
+set(CPACK_COMPONENTS_ALL LIBRARIES PROGRAM)
+
 # setup %config(noreplace)
 set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/stellar.toml")
 
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
deleted file mode 100644
index ab0272d..0000000
--- a/cmake/PostInstall.in
+++ /dev/null
@@ -1,2 +0,0 @@
-%systemd_post stellar.service
-/sbin/ldconfig
\ No newline at end of file
diff --git a/cmake/PostUninstall.in b/cmake/PostUninstall.in
deleted file mode 100644
index fda72ad..0000000
--- a/cmake/PostUninstall.in
+++ /dev/null
@@ -1,2 +0,0 @@
-%systemd_postun_with_restart stellar.service
-/sbin/ldconfig
\ No newline at end of file
diff --git a/cmake/PreUninstall.in b/cmake/PreUninstall.in
deleted file mode 100644
index e24c506..0000000
--- a/cmake/PreUninstall.in
+++ /dev/null
@@ -1 +0,0 @@
-%systemd_preun stellar.service
\ No newline at end of file