diff options
| author | seungha.son <seungha.son@samsung.com> | 2017-01-17 20:44:58 +0900 |
|---|---|---|
| committer | seungha.son <seungha.son@samsung.com> | 2017-01-18 10:42:17 +0900 |
| commit | a136b35c1d179bff20a0df90b43badff27b1c5cf (patch) | |
| tree | ffc0a31b42f0d1526c1f0f118af0c6dfd954ca0d | |
| parent | a5558e2f17ae3e49445a4e7b80710aa2a57b3ba5 (diff) | |
| download | notification-a136b35c1d179bff20a0df90b43badff27b1c5cf.tar.gz notification-a136b35c1d179bff20a0df90b43badff27b1c5cf.tar.bz2 notification-a136b35c1d179bff20a0df90b43badff27b1c5cf.zip | |
Fix versioning
Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: I0946ecb6f3694a52973752c1321a79148cfeeb9b
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | packaging/notification.spec | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cae911..5282bad 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") -SET(MAJOR_VER 0) -SET(VERSION ${MAJOR_VER}.1.0) ADD_SUBDIRECTORY(test-app) @@ -87,8 +85,8 @@ ADD_DEFINITIONS("-DHAVE_WAYLAND") ENDIF (HAVE_WAYLAND) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJOR_VER}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) ADD_EXECUTABLE(notification_init ${INIT-SRCS}) diff --git a/packaging/notification.spec b/packaging/notification.spec index e9c3edf..968efc2 100755 --- a/packaging/notification.spec +++ b/packaging/notification.spec @@ -46,12 +46,17 @@ Requires: %{name} = %{version}-%{release} Development files needed to build software that needs to system a system notification. %build +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" LDFLAGS="$LDFLAGS" %if %{with wayland} -%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_WAYLAND=On +%cmake . \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_WAYLAND=On \ + -DMAJORVER=${MAJORVER} -DFULLVER=%{version} %else -%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_X11=On +%cmake . \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} -DHAVE_X11=On \ + -DMAJORVER=${MAJORVER} -DFULLVER=%{version} %endif make %{?jobs:-j%jobs} |