From f8da5746c64b17a7e350fb7eecec86beb0cc13c7 Mon Sep 17 00:00:00 2001 From: Stephane Gouache Date: Wed, 15 Jan 2025 18:58:44 +0100 Subject: [PATCH] Fixes for packaging --- .github/workflows/pack-rpm.yml | 4 ++-- CMakeLists.txt | 3 +++ src/s3plugin.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pack-rpm.yml b/.github/workflows/pack-rpm.yml index 6c45fa1..c8f6edd 100644 --- a/.github/workflows/pack-rpm.yml +++ b/.github/workflows/pack-rpm.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - image: ['rockylinux:8', 'rockylinux:9'] + image: ['rockylinux:9'] container: image: ${{ matrix.image }} steps: @@ -75,7 +75,7 @@ jobs: strategy: fail-fast: false matrix: - rocky_version: [8, 9] + rocky_version: [9] permissions: contents: 'read' id-token: 'write' diff --git a/CMakeLists.txt b/CMakeLists.txt index 858f0c6..8cc042e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_BINARY_DIR}/bin/>) message(STATUS "Executables will be stored in ${CMAKE_BINARY_DIR}/bin/") message(STATUS "Libraries will be stored in ${CMAKE_BINARY_DIR}/lib/") +# Avoid generating shared libs with version number in the filename +set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1) + if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND NOT (CMAKE_BUILD_TYPE STREQUAL "Release")) message("Build system == Linux, build with sanitizer tools") diff --git a/src/s3plugin.h b/src/s3plugin.h index 4ccf33d..45335cf 100644 --- a/src/s3plugin.h +++ b/src/s3plugin.h @@ -2,7 +2,7 @@ #define KHIOPS_STR(s) #s // Driver version -#define DRIVER_VERSION KHIOPS_STR(0.0.13-rc.1) +#define DRIVER_VERSION KHIOPS_STR(0.0.13) // Release versions must have 3 digits, for example KHIOPS_STR(1.2.0) // Alpha, beta ou release candidate have an extra suffix, for example : // - KHIOPS_STR(1.2.0-a.1)