Fix error when built with TIZEN_PRODUCT_TV = 1 41/116641/1 accepted/tizen/common/20170227.140610 accepted/tizen/ivi/20170228.012835 accepted/tizen/mobile/20170228.012742 accepted/tizen/tv/20170228.012802 accepted/tizen/unified/20170309.035817 accepted/tizen/wearable/20170228.012819 submit/tizen/20170227.105257 submit/tizen_unified/20170308.100413
authorSilas Jeon <silas.jeon@samsung.com>
Mon, 27 Feb 2017 10:43:28 +0000 (19:43 +0900)
committerSilas Jeon <silas.jeon@samsung.com>
Mon, 27 Feb 2017 10:44:36 +0000 (19:44 +0900)
It makes error with TIZEN_PRODUCT_TV = 1 condition. The cause of the
error is that it does not copy gumd.service.wearable file but it
still needs that. Spec file is modified so that it always copies that
file. Removing wearable rpm when TIZEN_PRODUCT_TV is set seems more
reasonable, so that can be applied later.

Change-Id: I4c2511b6bdf7ccdae9892d23cf6815143b1f0e1f

packaging/gumd.spec

index 6877211..9037e31 100644 (file)
@@ -93,6 +93,7 @@ Requires:   libgum = %{version}-%{release}
 %setup -q -n %{name}-%{version}
 cp -a %{SOURCE1001} %{name}.manifest
 cp -a %{SOURCE1002} libgum.manifest
+cp data/gumd.service data/gumd.service.wearable
 
 %if "%{TIZEN_PRODUCT_TV}" ==  "1"
 mv "%{GUMD_DBUS_SERVICE}".vd.in "%{GUMD_DBUS_SERVICE}".in
@@ -100,7 +101,6 @@ mv "%{GUMD_DBUS_SERVICE}".vd.in "%{GUMD_DBUS_SERVICE}".in
 mv "%{GUMD_DBUS_SERVICE}".common.in "%{GUMD_DBUS_SERVICE}".in
 
 # wearable
-cp data/gumd.service data/gumd.service.wearable
 echo "CapabilityBoundingSet=~CAP_MAC_ADMIN" >> data/gumd.service.wearable
 echo "SmackProcessLabel=System" >> data/gumd.service.wearable
 # non-wearable
@@ -124,10 +124,10 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/%{name}
 install -m 644 data/tizen/etc/%{name}/%{name}-tizen-common.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 install -m 755 -d %{buildroot}%{_datadir}/upgrade/scripts
 install -m 644 data/500.gumd_upgrade.sh %{buildroot}%{_datadir}/upgrade/scripts
-%if "%{TIZEN_PRODUCT_TV}" !=  "1"
 install -m 755 -d %{buildroot}%{_unitdir}
-install -m 644 data/gumd.service %{buildroot}%{_unitdir}
 install -m 644 data/gumd.service.wearable %{buildroot}%{_unitdir}
+%if "%{TIZEN_PRODUCT_TV}" !=  "1"
+install -m 644 data/gumd.service %{buildroot}%{_unitdir}
 %endif
 
 %post