Skip to content

Commit b0063f3

Browse files
SwooshyCuebtrel
authored andcommitted
[irods/irods#5937] add package revision string to package version
1 parent 98db6b5 commit b0063f3

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ find_package(IRODS 4.2.10 EXACT REQUIRED)
44
set(IRODS_PLUGIN_REVISION "0")
55
set(IRODS_PLUGIN_VERSION "${IRODS_VERSION}.${IRODS_PLUGIN_REVISION}")
66

7+
set(IRODS_PACKAGE_REVISION "1")
8+
79
set(CMAKE_CXX_COMPILER ${IRODS_EXTERNALS_FULLPATH_CLANG}/bin/clang++)
810
set(CMAKE_CXX_STANDARD ${IRODS_CXX_STANDARD})
911
set(CMAKE_MODULE_LINKER_FLAGS_INIT "-Wl,--enable-new-dtags -Wl,--as-needed -Wl,-z,defs")
@@ -141,15 +143,19 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
141143
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://irods.org")
142144
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
143145
set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION ON)
146+
set(CPACK_DEBIAN_PACKAGE_RELEASE "${IRODS_PACKAGE_REVISION}")
147+
if (IRODS_LINUX_DISTRIBUTION_VERSION_CODENAME)
148+
set(CPACK_DEBIAN_PACKAGE_RELEASE "${CPACK_DEBIAN_PACKAGE_RELEASE}~${IRODS_LINUX_DISTRIBUTION_VERSION_CODENAME}")
149+
endif()
144150
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
145151

146152
set(CPACK_RPM_COMPONENT_INSTALL OFF)
147-
set(CPACK_RPM_PACKAGE_RELEASE "1")
148153
set(CPACK_RPM_PACKAGE_LICENSE "BSD-3-Clause")
149154
set(CPACK_RPM_PACKAGE_VENDOR "iRODS Consortium")
150155
set(CPACK_RPM_PACKAGE_URL "https://irods.org")
151156
set(CPACK_RPM_PACKAGE_AUTOREQ 0)
152157
set(CPACK_RPM_PACKAGE_AUTOPROV 0)
158+
set(CPACK_RPM_PACKAGE_RELEASE "${IRODS_PACKAGE_REVISION}")
153159
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
154160

155161
set(CPACK_ARCHIVE_COMPONENT_INSTALL OFF)

0 commit comments

Comments
 (0)