Removed some RPMLINT issues

Change-Id: I8e96a90fa14cf87e85f18ca2d3a6229316277a38
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/fido_svc_ui/CMakeLists.txt b/fido_svc_ui/CMakeLists.txt
index fe4ae45..f53e44c 100644 (file)
--- a/fido_svc_ui/CMakeLists.txt
+++ b/fido_svc_ui/CMakeLists.txt
@@ -1,32 +1,5 @@
-IF(NOT DEFINED UI_PACKAGE_NAME)
-       SET(UI_PACKAGE_NAME "org.tizen.fidosvcui")
-ENDIF(NOT DEFINED UI_PACKAGE_NAME)
 
-SET(UI_PREFIX "/usr/apps/${UI_PACKAGE_NAME}")
-
-IF(NOT DEFINED UI_BINDIR)
-       SET(UI_BINDIR "${UI_PREFIX}/bin")
-ENDIF(NOT DEFINED UI_BINDIR)
-
-IF(NOT DEFINED UI_RESDIR)
-       SET(UI_RESDIR "${UI_PREFIX}/res")
-ENDIF(NOT DEFINED UI_RESDIR)
-
-IF(NOT DEFINED UI_LOCALEDIR)
-       SET(UI_LOCALEDIR "${UI_PREFIX}/res/locale")
-ENDIF(NOT DEFINED UI_LOCALEDIR)
-
-IF(NOT DEFINED UI_MANIFESTDIR)
-        SET(UI_MANIFESTDIR "/usr/share/packages")
-ENDIF(NOT DEFINED UI_MANIFESTDIR)
-
-IF(NOT DEFINED UI_DESKTOP_ICONDIR)
-        SET(UI_DESKTOP_ICONDIR "/usr/share/icons/default/small")
-ENDIF(NOT DEFINED UI_DESKTOP_ICONDIR)
-
-IF(NOT DEFINED UI_DESKTOP_ICON)
-       SET(UI_DESKTOP_ICON ${UI_PACKAGE_NAME}.png)
-ENDIF(NOT DEFINED UI_DESKTOP_ICON)
+SET (UI_PACKAGE_NAME "org.tizen.fidosvcui")
 
 SET(UI_SRCS 
         ${CMAKE_SOURCE_DIR}/fido_svc_ui/fido_ui_server.c
@@ -64,6 +37,6 @@ ADD_DEPENDENCIES(${UI_PACKAGE_NAME} ${CMAKE_SOURCE_DIR}/common/fido-stub.c)
 TARGET_LINK_LIBRARIES(${UI_PACKAGE_NAME} "-pie" ${UI_PKGS_LDFLAGS})
 CONFIGURE_FILE(${UI_PACKAGE_NAME}.xml.in ${UI_PACKAGE_NAME}.xml)
 
-INSTALL(TARGETS ${UI_PACKAGE_NAME} DESTINATION ${UI_BINDIR})
-INSTALL(FILES ${UI_PACKAGE_NAME}.xml DESTINATION ${UI_MANIFESTDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_svc_ui/${UI_DESKTOP_ICON} DESTINATION ${UI_DESKTOP_ICONDIR})
+INSTALL(TARGETS ${UI_PACKAGE_NAME} DESTINATION ${BIN_DIR})
+INSTALL(FILES ${UI_PACKAGE_NAME}.xml DESTINATION ${MANIFEST_DIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_svc_ui/${UI_PACKAGE_NAME}.png DESTINATION ${ICON_DIR})

diff --git a/packaging/fido-client.spec b/packaging/fido-client.spec
index 331a1d1..64fa979 100644 (file)
--- a/packaging/fido-client.spec
+++ b/packaging/fido-client.spec
@@ -40,15 +40,23 @@ Requires(post): /usr/bin/sqlite3
 Requires(postun): /sbin/ldconfig
 
 %description
-Tizen FIDO Client
+Tizen FIDO Client provides FIDO UAF spec compliant APIs.
 
 %package devel
-Summary:    Development files for %{name}
+Summary:    Dev files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 %description devel
 Development files for %{name}
 
+%define _pkg_dir                %{TZ_SYS_RO_APP}/org.tizen.fidosvcui
+%define _bin_dir                %{_pkg_dir}/bin
+%define _lib_dir                %{_pkg_dir}/lib
+%define _res_dir                %{_pkg_dir}/res
+%define _locale_dir             %{_res_dir}/locale
+%define _manifest_dir           %{TZ_SYS_RO_PACKAGES}
+%define _icon_dir               %{TZ_SYS_RO_ICONS}/default/small
+
 %prep
 %setup -q
 
@@ -64,7 +72,12 @@ export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
 cmake . \
 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 -DLIBDIR=%{_libdir} \
--DINCLUDEDIR=%{_includedir}
+-DINCLUDEDIR=%{_includedir} \
+-DBIN_DIR=%{_bin_dir} \
+-DRES_DIR=%{_res_dir} \
+-DLOCALE_DIR=%{_locale_dir} \
+-DMANIFEST_DIR=%{_manifest_dir} \
+-DICON_DIR=%{_icon_dir}
 
 make %{?jobs:-j%jobs}
 
@@ -108,7 +121,7 @@ chsmack -a '_' %{_libdir}/fido/asm/
 /sbin/ldconfig
 
 %files
-/usr/share/license/%{name}
+%{TZ_SYS_SHARE}/license/%{name}
 %{_libdir}/*.so.*
 %manifest fido.manifest
 %config %{_sysconfdir}/dbus-1/system.d/org.tizen.fido.conf
@@ -130,8 +143,7 @@ chsmack -a '_' %{_libdir}/fido/asm/
 
 %package -n org.tizen.fidosvcui
 Summary:    FIDO Service UI
-Group:      Account
-#Requires:   %{name} = %{version}-%{release}
+Group:       Social & Content/API
 
 BuildRequires: cmake 
 BuildRequires: pkgconfig(capi-appfw-application)
@@ -143,25 +155,25 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(glib-2.0) >= 2.26
 BuildRequires:  pkgconfig(gio-unix-2.0)
+BuildRequires:  pkgconfig(libtzplatform-config)
 Requires: fido-client
 
 %description -n org.tizen.fidosvcui
-FIDO Service UI
+FIDO Service UI provides Authenticator selection UI.
 
 %files -n org.tizen.fidosvcui
 %defattr(-,root,root,-)
-/usr/share/license/%{name}
+%{TZ_SYS_SHARE}/license/%{name}
 %manifest org.tizen.fidosvcui.manifest
-/usr/apps/org.tizen.fidosvcui/bin/*
-##/usr/apps/org.tizen.fidosvcui/res/*
-/usr/share/packages/org.tizen.fidosvcui.xml
-/usr/share/icons/default/small/org.tizen.fidosvcui.png
+%{TZ_SYS_RO_APP}/org.tizen.fidosvcui/bin/*
+%{TZ_SYS_SHARE}/packages/org.tizen.fidosvcui.xml
+%{TZ_SYS_SHARE}/icons/default/small/org.tizen.fidosvcui.png
 
 #################################################################################
 # FIDO Dummy ASM
 %package -n dummyasm
 Summary:    FIDO Dummy ASM (Internal Dev)
-Group:      Account/Testing
+Group:      Social & Content/API
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(capi-appfw-application)
@@ -176,7 +188,7 @@ BuildRequires: pkgconfig(libtzplatform-config)
 Requires: fido-client
 
 %description -n dummyasm
-This is a dummy ASM.
+This is a dummy ASM for testing FIDO client.
 
 %files -n dummyasm
 %manifest dummyasm.manifest