Fix versioning

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f980441..a3ed0eb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ PROJECT(appcore-watch C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION_MAJOR 1)
-SET(VERSION "${VERSION_MAJOR}.1")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
@@ -45,8 +43,8 @@ ENDFOREACH(flag)
 
 AUX_SOURCE_DIRECTORY(src SOURCES)
 ADD_LIBRARY(${APPCORE_WATCH} SHARED ${SOURCES})
-SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES VERSION ${VERSION})
+SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES SOVERSION ${MAJORVER})
+SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES VERSION ${FULLVER})
 SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_watch})
 TARGET_LINK_LIBRARIES(${APPCORE_WATCH} ${pkg_watch_LDFLAGS} "-ldl -Wl,--no-undefined")
 

diff --git a/packaging/appcore-watch.spec b/packaging/appcore-watch.spec
index 9ddaa02..6e359f5 100644 (file)
--- a/packaging/appcore-watch.spec
+++ b/packaging/appcore-watch.spec
@@ -52,7 +52,11 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 export CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-function -Wno-unused-but-set-variable"
-%cmake .
+
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake -DFULLVER=%{version} \
+       -DMAJORVER=${MAJORVER} \
+       .
 
 make %{?jobs:-j%jobs}
 
@@ -74,9 +78,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %files
 %manifest appcore-watch.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libappcore-watch.so
-%{_libdir}/libappcore-watch.so.1
-%{_libdir}/libappcore-watch.so.1.1
+%{_libdir}/libappcore-watch.so*
 /usr/share/license/%{name}
 
 %files devel