Fix versioning

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9df14f0579cef859a7c005bbb261b870008f70d..46cc6e23d4627a44913bd072ad7fc89e5cbd633f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ SET(EXEC_PREFIX "\${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(VERSION_MAJOR "${MAJORVER}")
+SET(VERSION "${FULLVER}")
 
 SET(CMAKE_SKIP_BUILD_RPATH true)
 

diff --git a/packaging/minicontrol.spec b/packaging/minicontrol.spec
index d2a71906f505e49b96430ada55bb7e9540322f8d..6adc44e8fef0f11df6ef91d872471ceab5dacb30 100644 (file)
--- a/packaging/minicontrol.spec
+++ b/packaging/minicontrol.spec
@@ -33,10 +33,12 @@ Minicontrol library (devel).
 export CFLAGS+=" -fPIC "
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 LDFLAGS="$LDFLAGS"
+
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %if %{with wayland}
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_WAYLAND=On
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_WAYLAND=On -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %else
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_X11=On
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_X11=On -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %endif
 make %{?jobs:-j%jobs}