diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2017-02-15 13:17:16 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2017-02-15 13:17:16 +0900 |
| commit | 176a21b26b9294400c2038a821fc55103eee9967 (patch) | |
| tree | 118d46173b011c3822a088a33a2f5ef42f48c221 | |
| parent | e43c032102a1bc44f8d8801e7fa791e03d967d9c (diff) | |
| download | minicontrol-176a21b26b9294400c2038a821fc55103eee9967.tar.gz minicontrol-176a21b26b9294400c2038a821fc55103eee9967.tar.bz2 minicontrol-176a21b26b9294400c2038a821fc55103eee9967.zip | |
Fix versioning
Change-Id: Icdc2fd5a9f56b4c342f7e8999f4e77a5d7d77353
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/minicontrol.spec | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f9df14f..46cc6e2 100755 --- 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 d2a7190..6adc44e 100644 --- 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} |