Remove Profile Build Dependency (TV/IVI)

This commit removes the build dependency of TV and IVI.

Note:

1. This commit is not required for Tizen 3.0 release,
but for later Tizen versions. If maintainers do not feel
comfortable because of the release schedule, maintainers
may delay SR/merge this commit.

2. When maintainers submit SR, they need to submit
JIRA-TRE issues of the followings:
  - Add tel-plugin-packetservice-dbinit-profile_common for common profile if common has tel-plugin-packetservice
  - Add tel-plugin-packetservice-dbinit-profile_ivi for ivi profile if ivi has tel-plugin-packetservice
  - Add tel-plugin-packetservice-dbinit-profile_tv for tv profile if tv has tel-plugin-packetservice

Note that you should NOT remove tel-plugin-packetservice from the current
meta when you add these tel-plugin-packetservice-dbinit-profile_*

3. Please do not add more usage of profile. We are removing them now. (in 4.0)

Change-Id: I1a14bc91b2909e8d00ac7d393844d8986f80663c
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32f3393..26fd7b8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,18 +31,13 @@ IF (CONNECT_DEFAULT_CONNECTION_WITHOUT_TIMER)
   ADD_DEFINITIONS("-DCONNECT_DEFAULT_CONNECTION_WITHOUT_TIMER")
 ENDIF (CONNECT_DEFAULT_CONNECTION_WITHOUT_TIMER)
 
-IF (TIZEN_PROFILE_IVI)
-  SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/ivi)
-ELSEIF (TIZEN_PROFILE_TV)
-  SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/tv)
+IF (SUPPORT_VOLTE)
+  ADD_DEFINITIONS("-DTIZEN_SUPPORT_VOLTE")
+  SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/lte)
 ELSE ()
-  IF (SUPPORT_VOLTE)
-    ADD_DEFINITIONS("-DTIZEN_SUPPORT_VOLTE")
-    SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/lte)
-  ELSE ()
-    SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/3g)
-  ENDIF ()
+  SET(RES_DIR ${CMAKE_SOURCE_DIR}/resources/3g)
 ENDIF ()
+# The resource file dnet_db_init.sql is to be overwritten at post time for IVI.
 
 # default definitions #
 ADD_DEFINITIONS("-DFEATURE_TLOG_DEBUG")

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 142f442..27e92be 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 37
+%define patchlevel 38
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -26,10 +26,37 @@ BuildRequires:      pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(libtzplatform-config)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires:      %{name}-dbinit = %{version}-%{release}
+Recommends:    %{name}-dbinit-profile_common = %{version}-%{release}
 
 %description
 Telephony Packet Service library
 
+%package dbinit-profile_common
+SUmmary:       DB Init Script for non-IVI (tel-plugin-packageservice)
+Provides:      %{name}-dbinit = %{version}-%{release}
+Provides:      %{name}-dbinit-profile_mobile = %{version}-%{release}
+Provides:      %{name}-dbinit-profile_wearable = %{version}-%{release}
+Conflicts:     %{name}-dbinit-profile_tv
+Conflicts:     %{name}-dbinit-profile_ivi
+%description dbinit-profile_common
+Default DB init script for %{name} installation.
+Common for common/mobile/wearable profiles.
+
+%package dbinit-profile_tv
+Summary:       DB Init Script for TV (tel-plugin-packetservice)
+Provides:      %{name}-dbinit = %{version}-%{release}
+Conflicts:     %{name}-dbinit-profile_common
+%description dbinit-profile_tv
+DB init script for %{name} installation specialized for tv profile.
+
+%package dbinit-profile_ivi
+Summary:       DB Init Script for IVI (tel-plugin-packetservice)
+Provides:      %{name}-dbinit = %{version}-%{release}
+Conflicts:     %{name}-dbinit-profile_common
+%description dbinit-profile_ivi
+DB init script for %{name} installation specialized for ivi profile.
+
 %prep
 %setup -q
 
@@ -37,12 +64,6 @@ Telephony Packet Service library
 %cmake . -DSYSCONFDIR=%{_sysconfdir} \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
-%if "%{profile}" == "tv"
-       -DTIZEN_PROFILE_TV=1 \
-%endif
-%if "%{profile}" == "ivi"
-       -DTIZEN_PROFILE_IVI=1 \
-%endif
 #%if 0%{?model_build_feature_connect_default_connection_without_timer}
 #      -DCONNECT_DEFAULT_CONNECTION_WITHOUT_TIMER=1 \
 #%endif
@@ -102,21 +123,41 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%post dbinit-profile_tv
+mv %{_datadir}/ps-plugin/dnet_db_init.sql.tv %{_datadir}/ps-plugin/dnet_db_init.sql
+%preun dbinit-profile_tv
+mv %{_datadir}/ps-plugin/dnet_db_init.sql %{_datadir}/ps-plugin/dnet_db_init.sql.tv
+
+%post dbinit-profile_ivi
+mv %{_datadir}/ps-plugin/dnet_db_init.sql.ivi %{_datadir}/ps-plugin/dnet_db_init.sql
+%preun dbinit-profile_ivi
+mv %{_datadir}/ps-plugin/dnet_db_init.sql %{_datadir}/ps-plugin/dnet_db_init.sql.ivi
+
 %install
 %make_install
 mkdir -p %{buildroot}%{_datadir}/license
 mkdir -p %{buildroot}/etc/dbus-1/system.d/
 cp %{SOURCE1} %{buildroot}/etc/dbus-1/system.d/tel-plugin-ps.conf
+cp resources/tv/dnet_db_init.sql %{buildroot}%{_datadir}/ps-plugin/dnet_db_init.sql.tv
+cp resources/ivi/dnet_db_init.sql %{buildroot}%{_datadir}/ps-plugin/dnet_db_init.sql.ivi
 
 %files
 %manifest tel-plugin-packetservice.manifest
 %defattr(644,root,root,-)
 #%doc COPYING
 %{_datadir}/ps-plugin/dnet_db.sql
-%{_datadir}/ps-plugin/dnet_db_init.sql
 %{_datadir}/ps-plugin/dnet_db_upgrade_24_30.sql
 %{_datadir}/upgrade/scripts/500.dnet_db_upgrade_24_30.sh
 #%{_datadir}/ps-plugin/apns-conf.xml
 %{_libdir}/telephony/plugins/ps-plugin*
 %{_datadir}/license/tel-plugin-packetservice
 /etc/dbus-1/system.d/tel-plugin-ps.conf
+
+%files dbinit-profile_common
+%{_datadir}/ps-plugin/dnet_db_init.sql
+
+%files dbinit-profile_tv
+%{_datadir}/ps-plugin/dnet_db_init.sql.tv
+
+%files dbinit-profile_ivi
+%{_datadir}/ps-plugin/dnet_db_init.sql.ivi