Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add proper conflict handling between enterprise and non enterprise packages

This commit is contained in:
Wilfried Goesgens 2016-09-26 16:23:19 +02:00
parent 550189d0e3
commit ab432329d0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/rpm/arangodb.spec.in
View File

@ -43,7 +43,7 @@ Release: @ARANGODB_PACKAGE_REVISION@
Summary: The open-source, multi-model NoSQL database Summary: The open-source, multi-model NoSQL database
License: Apache-2.0 License: Apache-2.0
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Conflicts: @CPACK_PACKAGE_NAME@-client Conflicts: arangodb, @CPACKG_PACKAGE_CONFLICTS@, @CPACKG_PACKAGE_CONFLICTS@-client, @CPACK_PACKAGE_NAME@-client
Url: http://www.arangodb.com Url: http://www.arangodb.com
Vendor: @CPACK_PACKAGE_VENDOR@ Vendor: @CPACK_PACKAGE_VENDOR@
Prefix: @CPACK_PACKAGING_INSTALL_PREFIX@ Prefix: @CPACK_PACKAGING_INSTALL_PREFIX@
@ -60,7 +60,7 @@ BuildRoot: @CMAKE_CURRENT_BINARY_DIR@/_CPack_Packages/Linux/RPM/@CPACK_PACK
%package @CPACK_PACKAGE_NAME@-client %package @CPACK_PACKAGE_NAME@-client
Summary: ArangoDB shell as stand-alone package Summary: ArangoDB shell as stand-alone package
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Conflicts: @CPACK_PACKAGE_NAME@ Conflicts: arangodb, @CPACKG_PACKAGE_CONFLICTS@, @CPACKG_PACKAGE_CONFLICTS@-client, @CPACK_PACKAGE_NAME@
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- description ## --SECTION-- description

4
cmake/packages/client/deb.txt
View File

@ -49,7 +49,7 @@ set(CMAKE_TARGET_ARCHITECTURES @CMAKE_TARGET_ARCHITECTURES@)
set(ORIGINAL_SOURCE_DIR @PROJECT_SOURCE_DIR@) set(ORIGINAL_SOURCE_DIR @PROJECT_SOURCE_DIR@)
set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@) set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@)
set(CPACK_PACKAGE_NAME @CPACK_PACKAGE_NAME@) set(CPACK_PACKAGE_NAME @CPACK_PACKAGE_NAME@)
set(CPACKG_PACKAGE_CONFLICTS @CPACKG_PACKAGE_CONFLICTS@)
################################################################################ ################################################################################
# Get the final values for cpack: # Get the final values for cpack:
@ -62,7 +62,7 @@ set(CPACK_PACKAGE_CONTACT ${ARANGODB_PACKAGE_CONTACT})
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT}) set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, arangodb3") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}")
set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
set(CPACK_COMPONENTS_ALL debian-extras) set(CPACK_COMPONENTS_ALL debian-extras)
set(CPACK_GENERATOR "DEB") set(CPACK_GENERATOR "DEB")

2
cmake/packages/deb.cmake
View File

@ -4,7 +4,7 @@
################################################################################ ################################################################################
FILE(READ "${PROJECT_SOURCE_DIR}/Installation/debian/packagedesc.txt" CPACK_DEBIAN_PACKAGE_DESCRIPTION) FILE(READ "${PROJECT_SOURCE_DIR}/Installation/debian/packagedesc.txt" CPACK_DEBIAN_PACKAGE_DESCRIPTION)
set(CPACK_DEBIAN_PACKAGE_SECTION "database") set(CPACK_DEBIAN_PACKAGE_SECTION "database")
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, arangodb3-client") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}-client")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT}) set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})

2
cmake/packages/packages.cmake
View File

@ -13,9 +13,11 @@ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_STRIP_FILES "ON") set(CPACK_STRIP_FILES "ON")
if (${USE_ENTERPRISE}) if (${USE_ENTERPRISE})
set(CPACKG_PACKAGE_CONFLICTS "arangodb3")
set(CPACK_PACKAGE_NAME "arangodb3e") set(CPACK_PACKAGE_NAME "arangodb3e")
else () else ()
set(CPACK_PACKAGE_NAME "arangodb3") set(CPACK_PACKAGE_NAME "arangodb3")
set(CPACKG_PACKAGE_CONFLICTS "arangodb3e")
endif () endif ()
set(ARANGODB_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) set(ARANGODB_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
# eventually the package string will be modified later on: # eventually the package string will be modified later on: