diff options
| author | seungha.son <seungha.son@samsung.com> | 2017-01-18 13:04:19 +0900 |
|---|---|---|
| committer | seungha.son <seungha.son@samsung.com> | 2017-01-18 13:05:15 +0900 |
| commit | 025f4b247e00d75b73c043319cedee43d99d9524 (patch) | |
| tree | e753130b0bf68d7511aaec5bbde715c1ff9c5747 | |
| parent | 8c6993c5bbaed8f0897afd1be89a12889e809545 (diff) | |
| download | shortcut-025f4b247e00d75b73c043319cedee43d99d9524.tar.gz shortcut-025f4b247e00d75b73c043319cedee43d99d9524.tar.bz2 shortcut-025f4b247e00d75b73c043319cedee43d99d9524.zip | |
Fix versioning
Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: I4e481ecf2412706aaaba33186d641b81ef605cc3
| -rwxr-xr-x | lib/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | packaging/libshortcut.spec | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6b0e301..ca097ab 100755 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -6,8 +6,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") -SET(VERSION_MAJOR 0) -SET(VERSION "${VERSION_MAJOR}.0.1") INCLUDE(FindPkgConfig) pkg_check_modules(svc_pkgs REQUIRED @@ -55,5 +53,5 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/include/shortcut_error.h DESTINATION inclu INSTALL(FILES ${CMAKE_BINARY_DIR}/lib/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") -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}) diff --git a/packaging/libshortcut.spec b/packaging/libshortcut.spec index 64a2d20..7093718 100755 --- a/packaging/libshortcut.spec +++ b/packaging/libshortcut.spec @@ -39,7 +39,12 @@ Requires: %{name} = %{version}-%{release} cp %{SOURCE1001} . %build -%cmake . -DSYSCONFDIR=%{_sysconfdir} -DDB_PATH=%{TZ_SYS_DB}/.shortcut_service.db +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%cmake . \ + -DSYSCONFDIR=%{_sysconfdir} \ + -DDB_PATH=%{TZ_SYS_DB}/.shortcut_service.db \ + -DMAJORVER=${MAJORVER} \ + -DFULLVER=%{version} make %{?jobs:-j%jobs} %install |