add msg-manager to all profiles

Change-Id: Idca90a2f74db40c68def9fb8e3c4f6b5a45b6ab0
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf49b10..17d9759 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,6 @@ IF(_FEATURE_SMS_CDMA)
        ADD_DEFINITIONS("-DFEATURE_SMS_CDMA")
 ENDIF(_FEATURE_SMS_CDMA)
 
-IF(_MSG_WEARABLE_PROFILE)
-       ADD_DEFINITIONS("-DMSG_WEARABLE_PROFILE")
-       ADD_DEFINITIONS("-DMSG_CONTACTS_SERVICE_NOT_SUPPORTED")
-ENDIF(_MSG_WEARABLE_PROFILE)
-
 ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 
 ADD_DEFINITIONS(-DTZ_SYS_RO_APP_PATH="${TZ_SYS_RO_APP}")
@@ -58,9 +53,7 @@ ELSE(_FEATURE_SMS_CDMA)
 ADD_SUBDIRECTORY(plugin/sms_plugin)
 ENDIF(_FEATURE_SMS_CDMA)
 ADD_SUBDIRECTORY(plugin/mms_plugin)
-IF(_MSG_MOBILE_PROFILE)
 ADD_SUBDIRECTORY(manager)
-ENDIF()
 
 ##########################################################
 # Install Header Files

diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec
index 25d3efc..a674301 100755 (executable)
--- a/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@ -1,9 +1,3 @@
-# Do not provide .so automatically for the extensions.
-# This if statement is for backward compatibility with GBM/Obsolete build systems
-%if "%{?profile}" != "wearable" && "%{?profile}" != "mobile"
-%global __provides_exclude_from ^.*\\.(wearable|mobile)$
-%endif
-
 Name:           msg-service
 Version:        1.0.9
 Release:        2
@@ -56,14 +50,8 @@ BuildRequires: pkgconfig(motion)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(vconf)
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, tv, ivi, or undefined
-%if "%{?profile}" != "wearable"
 BuildRequires: pkgconfig(contacts-service2)
-%endif
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, or unified
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
+# Below BuildRequires-statements are only for msg-manager
 BuildRequires: gettext-tools
 BuildRequires: hash-signer
 BuildRequires: pkgconfig(badge)
@@ -76,45 +64,14 @@ BuildRequires: pkgconfig(capi-media-sound-manager)
 BuildRequires: pkgconfig(capi-media-recorder)
 BuildRequires: pkgconfig(feedback)
 BuildRequires: pkgconfig(notification)
-%endif
-Provides: %{name}-profile_common = %{version}-%{release}
-Provides: %{name}-profile_ivi = %{version}-%{release}
-Provides: %{name}-profile_tv = %{version}-%{release}
 
 %description
 Description: Messaging Framework Library
 
-%package profile_mobile
-summary:    msg-service extension for mobile profile
-requires:   %{name} = %{version}-%{release}
-conflicts:  %{name}-profile_wearable
-%description profile_mobile
-messaging framework library extension for tizen mobile profile.
-this overwrites some of msg-service binaries; thus, you need to
-reinstall msg-service if you want to keep using msg-service after
-uninstalling this package.
-
-%package profile_wearable
-summary:    msg-service extension for wearable profile
-requires:   %{name} = %{version}-%{release}
-conflicts:  %{name}-profile_mobile
-%description profile_wearable
-messaging framework library extension for tizen wearable profile.
-this overwrites some of msg-service binaries; thus, you need to
-reinstall msg-service if you want to keep using msg-service after
-uninstalling this package.
-
 %package devel
 License:        Apache-2.0
 Summary:        Messaging Framework Library (development)
 Requires:       %{name} = %{version}-%{release}
-# This if statement is for backward compatibility with GBM/Obsolete build systems
-%if "%{profile}" == "wearable"
-Requires:       %{name}-profile_wearable
-%endif
-%if "%{profile}" == "mobile"
-Requires:       %{name}-profile_mobile
-%endif
 Group:          Development/Libraries
 
 %description devel
@@ -180,12 +137,7 @@ Description: Message manager application
 %setup -q
 
 %build
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, or unified
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-mkdir -p build_mobile
-pushd build_mobile
-cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
                -DLIB_INSTALL_DIR=%{_libdir} \
                -DAPP_MANIFESTDIR=%{TZ_SYS_RO_PACKAGES}   \
                -DAPP_BINDIR=%{APP_PREFIX}/bin   \
@@ -195,51 +147,9 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
                -DTZ_SYS_GLOBALUSER_DB=%TZ_SYS_GLOBALUSER_DB \
                -DTZ_SYS_HOME=%TZ_SYS_HOME \
                -DTZ_SYS_BIN=%TZ_SYS_BIN \
-               %{i586_option} \
-               -D_MSG_WEARABLE_PROFILE:BOOL=OFF \
-               -D_MSG_MOBILE_PROFILE:BOOL=ON
-
-make %{?jobs:-j%jobs}
-popd
-%endif
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if wearable, common, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-mkdir -p build_wearable
-pushd build_wearable
-cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-               -DLIB_INSTALL_DIR=%{_libdir} \
-               -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
-               -DTZ_SYS_GLOBALUSER_DATA=%TZ_SYS_GLOBALUSER_DATA \
-               -DTZ_SYS_GLOBALUSER_DB=%TZ_SYS_GLOBALUSER_DB \
-               -DTZ_SYS_HOME=%TZ_SYS_HOME \
-               -DTZ_SYS_BIN=%TZ_SYS_BIN \
-               %{i586_option} \
-               -D_MSG_WEARABLE_PROFILE:BOOL=ON \
-               -D_MSG_MOBILE_PROFILE:BOOL=OFF
-
-make %{?jobs:-j%jobs}
-popd
-%endif
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if common, ivi, tv, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable"
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-               -DLIB_INSTALL_DIR=%{_libdir} \
-               -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
-               -DTZ_SYS_GLOBALUSER_DATA=%TZ_SYS_GLOBALUSER_DATA \
-               -DTZ_SYS_GLOBALUSER_DB=%TZ_SYS_GLOBALUSER_DB \
-               -DTZ_SYS_HOME=%TZ_SYS_HOME \
-               -DTZ_SYS_BIN=%TZ_SYS_BIN \
-               %{i586_option} \
-               -D_MSG_WEARABLE_PROFILE:BOOL=OFF \
-               -D_MSG_MOBILE_PROFILE:BOOL=OFF
+               %{i586_option}
 
 make %{?jobs:-j%jobs}
-%endif
 
 %install
 rm -rf %{buildroot}
@@ -247,50 +157,7 @@ mkdir -p %{buildroot}/etc/config
 mkdir -p %{buildroot}/usr/share/upgrade/scripts
 cp -f 500.msg-service.sh %{buildroot}/usr/share/upgrade/scripts
 
-# These .so files differ per profile. (sms/mms-plugin do not differ.)
-LIB_PER_PROFILE="libmsg_plugin_manager.so
-libmsg_framework_handler.so
-libmsg_transaction_manager.so
-libmsg_utils.so
-libmsg_externals.so
-libmsg_transaction_proxy.so
-libmsg_vobject.so"
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, or unified
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-pushd build_mobile
 %make_install
-popd
-pushd %{buildroot}%{_libdir}
-for FILE in $LIB_PER_PROFILE; do mv "${FILE}" "${FILE}.mobile"; done
-for FILE in libmsg_mapi*.so.*; do if [[ $FILE =~ .*mobile$ ]]; then echo skip "${FILE}"; else mv "${FILE}" "${FILE}.mobile"; fi; done
-popd
-pushd %{buildroot}%{_bindir}
-mv msg-server msg-server.mobile
-popd
-%endif
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if wearable, common, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-pushd build_wearable
-%make_install
-popd
-pushd %{buildroot}%{_libdir}
-for FILE in $LIB_PER_PROFILE; do mv "${FILE}" "${FILE}.wearable"; done
-for FILE in libmsg_mapi*.so.*; do if [[ $FILE =~ .*mobile$ ]]; then echo skip "${FILE}"; else mv "${FILE}" "${FILE}.wearable"; fi; done
-popd
-pushd %{buildroot}%{_bindir}
-mv msg-server msg-server.wearable
-popd
-%endif
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if common, ivi, tv, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable"
-%make_install
-%endif
 
 %define tizen_sign 1
 %define tizen_sign_base %{APP_PREFIX}
@@ -367,12 +234,7 @@ setfacl -m group:priv_message_write:rw %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipc
 %files
 %manifest msg-service.manifest
 %license LICENSE.APLv2
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if common, ivi, tv, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable"
 %{_bindir}/msg-server
-%exclude %{_libdir}/libmsg_*.wearable
-%exclude %{_libdir}/libmsg_*.mobile
 %{_libdir}/libmsg_plugin_manager.so
 %{_libdir}/libmsg_mapi.so.*
 %{_libdir}/libmsg_framework_handler.so
@@ -381,77 +243,8 @@ setfacl -m group:priv_message_write:rw %{TZ_SYS_GLOBALUSER_DATA}/msg-service/ipc
 %{_libdir}/libmsg_externals.so
 %{_libdir}/libmsg_transaction_proxy.so
 %{_libdir}/libmsg_vobject.so
-%endif
 /usr/share/upgrade/scripts/500.msg-service.sh
 
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, or unified
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-%post profile_mobile
-mv %{_bindir}/msg-server.mobile %{_bindir}/msg-server
-pushd %{_libdir}
-mv libmsg_plugin_manager.so.mobile libmsg_plugin_manager.so
-for FILE in libmsg_mapi.so.*.mobile; do mv "${FILE}" "${FILE%.mobile}"; done
-mv libmsg_framework_handler.so.mobile libmsg_framework_handler.so
-mv libmsg_transaction_manager.so.mobile libmsg_transaction_manager.so
-mv libmsg_utils.so.mobile libmsg_utils.so
-mv libmsg_externals.so.mobile libmsg_externals.so
-mv libmsg_transaction_proxy.so.mobile libmsg_transaction_proxy.so
-mv libmsg_vobject.so.mobile libmsg_vobject.so
-popd
-/sbin/ldconfig
-%postun profile_mobile
-/sbin/ldconfig
-%preun profile_mobile
-echo "If you want to keep using %name after uninstalling this, you need to reinstall %name after uninstalling this."
-%files profile_mobile
-%manifest msg-manager.manifest
-%license LICENSE.APLv2
-%{_bindir}/msg-server.mobile
-%{_libdir}/libmsg_plugin_manager.so.mobile
-%{_libdir}/libmsg_mapi.so.*.mobile
-%{_libdir}/libmsg_framework_handler.so.mobile
-%{_libdir}/libmsg_transaction_manager.so.mobile
-%{_libdir}/libmsg_utils.so.mobile
-%{_libdir}/libmsg_externals.so.mobile
-%{_libdir}/libmsg_transaction_proxy.so.mobile
-%{_libdir}/libmsg_vobject.so.mobile
-%endif
-
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if wearable, common, or unified
-%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
-%post profile_wearable
-mv %{_bindir}/msg-server.wearable %{_bindir}/msg-server
-pushd %{_libdir}
-mv libmsg_plugin_manager.so.wearable libmsg_plugin_manager.so
-for FILE in libmsg_mapi.so.*.wearable; do mv "${FILE}" "${FILE%.wearable}"; done
-mv libmsg_framework_handler.so.wearable libmsg_framework_handler.so
-mv libmsg_transaction_manager.so.wearable libmsg_transaction_manager.so
-mv libmsg_utils.so.wearable libmsg_utils.so
-mv libmsg_externals.so.wearable libmsg_externals.so
-mv libmsg_transaction_proxy.so.wearable libmsg_transaction_proxy.so
-mv libmsg_vobject.so.wearable libmsg_vobject.so
-popd
-/sbin/ldconfig
-%postun profile_wearable
-/sbin/ldconfig
-%preun profile_wearable
-echo "If you want to keep using %name after uninstalling this, you need to reinstall %name after uninstalling this."
-%files profile_wearable
-%manifest msg-manager.manifest
-%license LICENSE.APLv2
-%{_bindir}/msg-server.wearable
-%{_libdir}/libmsg_plugin_manager.so.wearable
-%{_libdir}/libmsg_mapi.so.*.wearable
-%{_libdir}/libmsg_framework_handler.so.wearable
-%{_libdir}/libmsg_transaction_manager.so.wearable
-%{_libdir}/libmsg_utils.so.wearable
-%{_libdir}/libmsg_externals.so.wearable
-%{_libdir}/libmsg_transaction_proxy.so.wearable
-%{_libdir}/libmsg_vobject.so.wearable
-%endif
-
 %files devel
 %license LICENSE.APLv2
 %{_libdir}/libmsg_mapi.so
@@ -477,9 +270,6 @@ echo "If you want to keep using %name after uninstalling this, you need to reins
 %license LICENSE.APLv2
 %{_libdir}/libmsg_mms_plugin.so
 
-# This is for backward compatibility. This does not damage 4.0 configurability
-# if mobile, common, or unified
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi"
 %files -n msg-manager
 %manifest msg-manager.manifest
 %license LICENSE.APLv2
@@ -488,6 +278,5 @@ echo "If you want to keep using %name after uninstalling this, you need to reins
 %{APP_PREFIX}/author-signature.xml
 %{APP_PREFIX}/signature1.xml
 %{APP_RESDIR}/*
-%endif
 
 %changelog

diff --git a/proxy/CMakeLists.txt b/proxy/CMakeLists.txt
index 45d7ecd..ddab5f3 100755 (executable)
--- a/proxy/CMakeLists.txt
+++ b/proxy/CMakeLists.txt
@@ -32,11 +32,7 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-IF(_MSG_WEARABLE_PROFILE)
-pkg_check_modules(trans_proxy_pkgs REQUIRED glib-2.0 dlog vconf)
-ELSE()
 pkg_check_modules(trans_proxy_pkgs REQUIRED glib-2.0 dlog vconf contacts-service2)
-ENDIF()
 
 FOREACH(flag ${trans_proxy_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")