From dde1f1975c0794ad3976dd81e660d3a40268d0b3 Mon Sep 17 00:00:00 2001 From: Silas Jeon Date: Mon, 27 Feb 2017 19:43:28 +0900 Subject: [PATCH] Fix error when built with TIZEN_PRODUCT_TV = 1 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/gumd.spec b/packaging/gumd.spec index 6877211..9037e31 100644 --- a/packaging/gumd.spec +++ b/packaging/gumd.spec @@ -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 -- 2.7.4