Fix versioning 66/110766/1
authorseungha.son <seungha.son@samsung.com>
Wed, 18 Jan 2017 02:34:33 +0000 (11:34 +0900)
committerseungha.son <seungha.son@samsung.com>
Wed, 18 Jan 2017 02:35:46 +0000 (11:35 +0900)
Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: I180dbf428528918f78b1e64bca955730a7a5b2fa

CMakeLists.txt
packaging/badge.spec

index d7c024a34ba89f7ef1391877ad3b120e70af7d41..c71e1617f1f1ab5cb53646035c5919e01f05445a 100755 (executable)
@@ -7,8 +7,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(PROJECT_NAME "${PROJECT_NAME}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.1")
 
 SET(CMAKE_SKIP_BUILD_RPATH true)
 
@@ -67,8 +65,8 @@ ADD_DEFINITIONS("-DBADGE_USE_DLOG")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
-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})
 
 ADD_EXECUTABLE(badge_init ${INIT-SRCS})
index fe466a94d6754d933ce4dc454d8ba172ed84a945..8d4b319452b327db791eb899e8e1f277f1e53640 100755 (executable)
@@ -44,7 +44,11 @@ Development files needed to build badge service
 
 %build
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" %cmake .
+LDFLAGS="$LDFLAGS"
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake . \
+       -DMAJORVER=${MAJORVER} \
+       -DFULLVER=%{version}
 make %{?jobs:-j%jobs}
 
 %install