From 31680ea99b10d59716e4454317cc3ba9921ca7cb Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 17 Jan 2017 10:58:58 +0900 Subject: [PATCH] Fix versioning Change-Id: I857d7721a5f2b31c55dfdcf813ea99d2a3124cc9 Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 5 ++--- packaging/librua.spec | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 133d422..80f24be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ PROJECT(rua C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") -SET(VERSION 0.1.0) AUX_SOURCE_DIRECTORY(src SRCS) @@ -26,8 +25,8 @@ ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_DEFINITIONS("-DDATAFS=\"$ENV{DATADIR}\"") ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) diff --git a/packaging/librua.spec b/packaging/librua.spec index ec55071..7beae63 100644 --- a/packaging/librua.spec +++ b/packaging/librua.spec @@ -38,7 +38,11 @@ Recently used application library (test) cp %{SOURCE1001} . %build -%cmake . +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%cmake -DFULLVER=%{version} \ + -DMAJORVER=%{MAJORVER} \ + . + make %{?_smp_mflags} %install -- 2.7.4