diff options
| -rw-r--r-- | packaging/ug-nfc-efl.spec | 7 | ||||
| -rwxr-xr-x | wearable/app/src/nsa-main.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec index 45c9e14..50a896a 100644 --- a/packaging/ug-nfc-efl.spec +++ b/packaging/ug-nfc-efl.spec @@ -1,6 +1,6 @@ Name: ug-nfc-efl Summary: NFC Setting UI -Version: 3.1.8 +Version: 3.1.9 Release: 0 Group: App/Network License: Flora-1.1 @@ -139,6 +139,9 @@ mv %{buildroot}/usr/share/packages/* wearable_ins/packages/ %endif %install +mkdir -p %{buildroot}/usr/share/license +cp -af %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/ + mkdir -p %{buildroot}/usr/share/packages mv common_ins/packages/* %{buildroot}/usr/share/packages/ mv wearable_ins/packages/* %{buildroot}/usr/share/packages/ @@ -204,7 +207,7 @@ rm /usr/ug/lib/libug-nfc-efl* %files %defattr(-,root,root,-) -%license LICENSE.Flora +%{_datadir}/license/LICENSE.Flora # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if common || tv || ivi || "undefined" diff --git a/wearable/app/src/nsa-main.c b/wearable/app/src/nsa-main.c index 57c0845..78df7c9 100755 --- a/wearable/app/src/nsa-main.c +++ b/wearable/app/src/nsa-main.c @@ -116,7 +116,7 @@ static void __parse_service(app_control_h service, void *user_data) ad->op_type = NSA_OP_NFC; - if (strncmp(operation, APP_CONTROL_OPERATION_SETTING_NFC, + if (operation != NULL && strncmp(operation, APP_CONTROL_OPERATION_SETTING_NFC, strlen(APP_CONTROL_OPERATION_SETTING_NFC)) == 0) { /* launched by app-control */ app_control_clone(&(ad->service), service); |