Fix versioning 91/110691/4
authorseungha.son <seungha.son@samsung.com>
Tue, 17 Jan 2017 11:44:58 +0000 (20:44 +0900)
committerseungha.son <seungha.son@samsung.com>
Wed, 18 Jan 2017 01:42:17 +0000 (10:42 +0900)
Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: I0946ecb6f3694a52973752c1321a79148cfeeb9b

CMakeLists.txt
packaging/notification.spec

index 9cae91169da5cef835cdbd499d9e7d7bc51f3acc..5282bad7d44cf94bd1b2438d296c2c9be2c533bd 100755 (executable)
@@ -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})
index e9c3edfee4165add4c7190b51ee5e32b76ac6e59..968efc2131c06174ff9f7d3425e95e01232c2d03 100755 (executable)
@@ -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}