Fixed RPM package build issue

Change-Id: I2f5760fcbfe753e019422b3d00926cc9daf2cb2f
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 f53e44c..5c393fe 100644 (file)
--- a/fido_svc_ui/CMakeLists.txt
+++ b/fido_svc_ui/CMakeLists.txt
@@ -38,5 +38,5 @@ 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 ${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})
+INSTALL(FILES ${UI_PACKAGE_NAME}.xml DESTINATION /opt/share/packages/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_svc_ui/${UI_PACKAGE_NAME}.png DESTINATION /opt/share/icons/default/small/)

diff --git a/packaging/fido-client.spec b/packaging/fido-client.spec
index 64fa979..ecb3c9e 100644 (file)
--- a/packaging/fido-client.spec
+++ b/packaging/fido-client.spec
@@ -8,7 +8,7 @@ License:    Apache-2.0
 Source0:    fido-client-%{version}.tar.gz
 Source1:    org.tizen.fido.service
 Source2:    org.tizen.fido.conf
-Source3:    org.tizen.fido.service
+Source3:    fido.service
 
 Source4:    org.tizen.dummyasm.service
 Source5:    org.tizen.dummyasm.conf
@@ -83,8 +83,7 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.Apache-2.0  %{buildroot}/usr/share/license/%{name}
+
 %make_install
 
 mkdir -p %{buildroot}/usr/share/dbus-1/system-services
@@ -94,8 +93,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-install -m 644 %SOURCE3 %{buildroot}%{_unitdir}/org.tizen.fido.service
-%install_service multi-user.target.wants org.tizen.fido.service
+install -m 644 %SOURCE3 %{buildroot}%{_unitdir}/fido.service
+%install_service multi-user.target.wants fido.service
 
 mkdir -p %{buildroot}/usr/share/dbus-1/system-services
 install -m 0644 %SOURCE4 %{buildroot}/usr/share/dbus-1/system-services/org.tizen.dummyasm.service
@@ -121,13 +120,12 @@ chsmack -a '_' %{_libdir}/fido/asm/
 /sbin/ldconfig
 
 %files
-%{TZ_SYS_SHARE}/license/%{name}
 %{_libdir}/*.so.*
 %manifest fido.manifest
 %config %{_sysconfdir}/dbus-1/system.d/org.tizen.fido.conf
 %{_bindir}/fido-service
-%attr(0644,root,root) %{_unitdir}/org.tizen.fido.service
-%attr(0644,root,root) %{_unitdir}/multi-user.target.wants/org.tizen.fido.service
+%attr(0644,root,root) %{_unitdir}/fido.service
+%attr(0644,root,root) %{_unitdir}/multi-user.target.wants/fido.service
 %attr(0644,root,root) /usr/share/dbus-1/system-services/org.tizen.fido.service
 
 %files devel
@@ -163,7 +161,6 @@ FIDO Service UI provides Authenticator selection UI.
 
 %files -n org.tizen.fidosvcui
 %defattr(-,root,root,-)
-%{TZ_SYS_SHARE}/license/%{name}
 %manifest org.tizen.fidosvcui.manifest
 %{TZ_SYS_RO_APP}/org.tizen.fidosvcui/bin/*
 %{TZ_SYS_SHARE}/packages/org.tizen.fidosvcui.xml

diff --git a/packaging/fido.service b/packaging/fido.service
new file mode 100644 (file)
index 0000000..477adfe
--- /dev/null
+++ b/packaging/fido.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=FIDO Client service
+After=tizen-runtime.target
+Requires=tizen-runtime.target
+
+[Service]
+#User=system
+#Gruop=system
+Type=dbus
+BusName=org.tizen.fido
+ExecStart=/usr/bin/fido-service
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target