Add TEST_APP_SUPPORT macro

Change-Id: Iadc93ad81213edbfc054d81171974bc91dc44b72
Signed-off-by: Sabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de6dd71..c26c83a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,9 +45,9 @@ ADD_SUBDIRECTORY(email-daemon)
 ##########################################################
 # Define Test App
 ##########################################################
-
-ADD_SUBDIRECTORY(utilities)
-
+IF (TEST_APP_SUPPORT)
+       ADD_SUBDIRECTORY(utilities)
+ENDIF (TEST_APP_SUPPORT)
 ##########################################################
 # Define Install Files
 ##########################################################

diff --git a/email-core/CMakeLists.txt b/email-core/CMakeLists.txt
index 7e0efaf..011923d 100755 (executable)
--- a/email-core/CMakeLists.txt
+++ b/email-core/CMakeLists.txt
@@ -173,7 +173,7 @@ TARGET_LINK_LIBRARIES(${CORE-SOUND-LIB} ${core_sound_pkgs_LDFLAGS} ${STORAGE-LIB
 SET_TARGET_PROPERTIES(${CORE-SOUND-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${CORE-SOUND-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${CORE-SOUND-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${CORE-SOUND-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 ##########################################################
 # Define Core lib

diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index ef73283..b007756 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -1,3 +1,4 @@
+%global test_email_app_enabled 0
 Name:       email-service
 Summary:    E-mail Framework Middleware package
 Version:    0.10.101
@@ -76,7 +77,10 @@ export CFLAGS="${CFLAGS} -fPIC -Wall -g -fvisibility=hidden"
 export CXXFLAGS="${CXXFLAGS} -fPIC -Wall -g -fvisibility=hidden"
 export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--rpath=%{_libdir} -Wl,--as-needed"
 
-%cmake .
+%cmake .  \
+%if %{test_email_app_enabled}
+        -DTEST_APP_SUPPORT=On
+%endif
 
 make %{?_smp_mflags}
 
@@ -219,18 +223,24 @@ systemctl daemon-reload
 
 %files
 %manifest email-service.manifest
-%exclude /usr/bin/email-test-app
+%if %{test_email_app_enabled}
+/usr/bin/email-test-app
+%endif
 %{_bindir}/email-service
 /opt/usr/data/email/res/*
 %{_libdir}/lib*.so.*
-/usr/lib/systemd/user/email.service
-/usr/lib/systemd/user/tizen-middleware.target.wants/email.service
-/usr/share/dbus-1/services/email-service.service
-/usr/share/license/email-service
+%{_libdir}/libemail-core-sound.so
+%{_libdir}/libemail-core-sound.so.*
+%{_unitdir_user}/email.service
+%{_unitdir_user}/tizen-middleware.target.wants/email.service
+%{_datarootdir}/dbus-1/services/email-service.service
+%{_datarootdir}/license/email-service
 
 /opt/etc/smack/accesses.d/email-service.rule
 
 %files devel
 %{_includedir}/email-service/*.h
 %{_libdir}/lib*.so
+%{_libdir}/libemail-core-sound.so
+%{_libdir}/libemail-core-sound.so.*
 %{_libdir}/pkgconfig/*.pc