The added service files are change to use for product 59/103759/6 accepted/tizen/3.0/common/20161216.123520 accepted/tizen/3.0/ivi/20161216.084240 accepted/tizen/3.0/mobile/20161216.083718 accepted/tizen/3.0/tv/20161216.084009 accepted/tizen/3.0/wearable/20161216.084135 submit/tizen_3.0/20161213.081002 submit/tizen_3.0/20161215.110001
authorYoungHun Kim <yh8004.kim@samsung.com>
Fri, 9 Dec 2016 10:08:13 +0000 (19:08 +0900)
committerYoungHun Kim <yh8004.kim@samsung.com>
Mon, 12 Dec 2016 11:54:21 +0000 (20:54 +0900)
Change-Id: I89433ff59f0d495e2579dac063e1fc37a774dd46

packaging/muse-server-vd_product_audio.service [moved from packaging/muse-server-audio_product.service with 87% similarity]
packaging/muse-server-vd_product_tv.service [moved from packaging/muse-server-tv.service with 87% similarity]
packaging/mused.spec

similarity index 87%
rename from packaging/muse-server-audio_product.service
rename to packaging/muse-server-vd_product_audio.service
index 698a7b3..2ddcfb5 100644 (file)
@@ -1,5 +1,5 @@
 [Unit]
-Description=muse server
+Description=muse server of vd product (audio)
 
 [Service]
 Type=forking
similarity index 87%
rename from packaging/muse-server-tv.service
rename to packaging/muse-server-vd_product_tv.service
index ac231af..f2fecce 100644 (file)
@@ -1,5 +1,5 @@
 [Unit]
-Description=muse server
+Description=muse server of vd product (tv)
 
 [Service]
 Type=forking
index 37160bf..72c4f6c 100644 (file)
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A Multimedia Daemon in Tizen Native API
-Version:    0.1.39
+Version:    0.1.40
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -8,8 +8,8 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    muse-server.service
 Source2:    muse-server.socket
 Source3:    muse-server.path
-Source4:    muse-server-tv.service
-Source5:    muse-server-audio_product.service
+Source4:    muse-server-vd_product_tv.service
+Source5:    muse-server-vd_product_audio.service
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -61,16 +61,13 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE -D_GNU_SOURCE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE -D_GNU_SOURCE"
 %endif
 
-%if "%{?profile}" != "tv"
-export CFLAGS+=" -DMUSE_USE_LOG"
-%endif
-
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
-%if "%{?TIZEN_PRODUCT_TV}" == "1"
+%if ("%{VD_PRODUCT_TYPE}" == "TV") || ("%{VD_PRODUCT_TYPE}" == "LFD") || ("%{VD_PRODUCT_TYPE}" == "HTV")
 export CFLAGS+=" -DTIZEN_PRODUCT_TV -DMUSE_REGISTER_VIP -DMUSE_USE_LWIPC -DMUSE_TTRACE_LOG"
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1 -DMUSE_TTRACE_LOG=1
 %else
+export CFLAGS+=" -DMUSE_USE_LOG"
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA
 %endif
 
@@ -85,27 +82,27 @@ cp muse-server %{buildroot}/usr/bin
 
 %make_install
 
-%if "%{?profile}" == "tv"
 %if ("%{VD_PRODUCT_TYPE}" == "AUDIO")
 mkdir -p %{buildroot}%{_unitdir}/stater.target.wants
 install -m 0644 %SOURCE5 %{buildroot}%{_unitdir}/muse-server.service
 %install_service starter.target.wants muse-server.service
 %else
+%if ("%{VD_PRODUCT_TYPE}" == "TV") || ("%{VD_PRODUCT_TYPE}" == "LFD") || ("%{VD_PRODUCT_TYPE}" == "HTV")
 mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 install -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/muse-server.service
 %install_service basic.target.wants muse-server.service
-%endif
 %else
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/muse-server.service
 %install_service multi-user.target.wants muse-server.service
 %endif
+%endif
 
 mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
 install -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/muse-server.socket
 %install_service sockets.target.wants muse-server.socket
 
-%if "%{?TIZEN_PRODUCT_TV}" != "1"
+%if ("%{VD_PRODUCT_TYPE}" != "TV") && ("%{VD_PRODUCT_TYPE}" != "LFD") && ("%{VD_PRODUCT_TYPE}" != "HTV") && ("%{VD_PRODUCT_TYPE}" != "AUDIO")
 install -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/muse-server.path
 %endif
 
@@ -128,18 +125,18 @@ chsmack -a "System::Shared" /var/log/%{name}
 %{_libdir}/libmused.so.*
 %{_datadir}/license/%{name}
 %{_unitdir}/muse-server.service
-%if "%{?profile}" == "tv"
 %if ("%{VD_PRODUCT_TYPE}" == "AUDIO")
 %{_unitdir}/starter.target.wants/muse-server.service
 %else
+%if ("%{VD_PRODUCT_TYPE}" == "TV") || ("%{VD_PRODUCT_TYPE}" == "LFD") || ("%{VD_PRODUCT_TYPE}" == "HTV")
 %{_unitdir}/basic.target.wants/muse-server.service
-%endif
 %else
 %{_unitdir}/multi-user.target.wants/muse-server.service
 %endif
+%endif
 %{_unitdir}/muse-server.socket
 %{_unitdir}/sockets.target.wants/muse-server.socket
-%if "%{?TIZEN_PRODUCT_TV}" != "1"
+%if ("%{VD_PRODUCT_TYPE}" != "TV") && ("%{VD_PRODUCT_TYPE}" != "LFD") && ("%{VD_PRODUCT_TYPE}" != "HTV") && ("%{VD_PRODUCT_TYPE}" != "AUDIO")
 %{_unitdir}/muse-server.path
 %endif
 %{TZ_SYS_DATA}/%{name}