Fix versioning

Change-Id: Ib9413a0831fece6ddbc92d62a14c9fc183990c67
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d756df..1b63904 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 PROJECT(syspopup_mods C)
-SET(VERSION 1.1)
 
 ### Global setting ###
 

diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index 4a4506f..d012a31 100644 (file)
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -73,6 +73,7 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} .
 
 %build
 
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake \
 %if %{with wayland}
        -Dwith_wayland=TRUE \
@@ -84,6 +85,8 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} .
        -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
        -DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \
        -DEXTRA_CFLAGS=-fPIC \
+       -DFULLVER=%{version} \
+       -DMAJORVER=${MAJORVER} \
        .
 
 make %{?jobs:-j%jobs}
@@ -117,7 +120,7 @@ cp -f scripts/502.syspopup_upgrade.sh %{buildroot}%{upgrade_script_path}
 %defattr(-,root,root,-)
 %{_bindir}/sp_test
 %{_bindir}/sp_initdb
-%{_libdir}/libsyspopup.so.0.1.0
+%{_libdir}/libsyspopup.so*
 %{_datadir}/popup_noti_term
 %TZ_SYS_RO_SHARE/license/%{name}
 %{upgrade_script_path}/502.syspopup_upgrade.sh
@@ -134,7 +137,7 @@ cp -f scripts/502.syspopup_upgrade.sh %{buildroot}%{upgrade_script_path}
 %files caller
 %manifest %{name}-caller.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libsyspopup_caller.so.0.1.0
+%{_libdir}/libsyspopup_caller.so*
 %TZ_SYS_RO_SHARE/license/%{name}-caller
 
 %files caller-devel

diff --git a/syspopup-caller/CMakeLists.txt b/syspopup-caller/CMakeLists.txt
index aee2857..78c94e8 100644 (file)
--- a/syspopup-caller/CMakeLists.txt
+++ b/syspopup-caller/CMakeLists.txt
@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 PROJECT(syspopup_caller C)
-SET(VERSION 1.1)
 
 ### Global setting ###
 
@@ -56,7 +55,8 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 add_library(syspopup_caller SHARED syspopup_caller.c)
 target_link_libraries(syspopup_caller syspopup_mods ${spcpkgs_LDFLAGS})
-SET_TARGET_PROPERTIES(syspopup_caller PROPERTIES SOVERSION 0.1.0)
+SET_TARGET_PROPERTIES(syspopup_caller PROPERTIES SOVERSION ${MAJORVER})
+SET_TARGET_PROPERTIES(syspopup_caller PROPERTIES VERSION ${FULLVER})
 
 SET(PC_NAME libsyspopup_caller)
 SET(PC_REQUIRED ${pc_requires})

diff --git a/syspopup/CMakeLists.txt b/syspopup/CMakeLists.txt
index 982dc18..42401fa 100644 (file)
--- a/syspopup/CMakeLists.txt
+++ b/syspopup/CMakeLists.txt
@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 PROJECT(syspopup C)
-SET(VERSION 1.1)
 
 ### Global setting ###
 
@@ -67,7 +66,8 @@ IF(with_x11)
 ENDIF(with_x11)
 
 target_link_libraries(syspopup syspopup_mods ${sppkgs_LDFLAGS})
-SET_TARGET_PROPERTIES(syspopup PROPERTIES SOVERSION 0.1.0)
+SET_TARGET_PROPERTIES(syspopup PROPERTIES SOVERSION ${MAJORVER})
+SET_TARGET_PROPERTIES(syspopup PROPERTIES VERSION ${FULLVER})
 
 SET(PC_NAME libsyspopup)
 SET(PC_REQUIRED ${pc_requires})