Add manifest for appinfo

Change-Id: Ic6e141d44e23118e50f6ecd3a8ca628082fd808c

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index c3313e4b7b7ed6d5413bc0c32381b45edfd7f4bf..e90992e20df7d3e6dbdc6184aba7bfa4445cc4a0 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -1,7 +1,7 @@
 # FOR COMMENTING DEFINITION, MUST USE %% instead of %
 %global use_autostart "-DUSE_AUTOSTART=1"
 %global use_gdbus "-DUSE_GDBUS=1"
-#%%global test_client "-DTEST_CLIENT=1"
+%global test_client "-DTEST_CLIENT=1"
 
 Name:       smartcard-service
 Summary:    Smartcard Service FW
@@ -13,6 +13,7 @@ Source0:    %{name}-%{version}.tar.gz
 %if 0%{!?use_autostart:1}
 Source1:    smartcard-service-server.init
 %endif
+BuildRequires: cmake
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(security-server)
@@ -20,63 +21,74 @@ BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(libssl)
-BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: pkgconfig(pkgmgr)
 BuildRequires: pkgconfig(pkgmgr-info)
-BuildRequires: cmake
+%if 0%{!?use_gdbus:1}
+BuildRequires: pkgconfig(dbus-glib-1)
+%endif
+# for gdbus
 BuildRequires: python
 BuildRequires: python-xml
-BuildRequires: gettext-tools
 
 Requires(post):   /sbin/ldconfig
-Requires(post):   /usr/bin/vconftool
-requires(postun): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires:         smartcard-service-common = %{version}-%{release}
+
 
 %description
 Smartcard Service FW.
 
+
 %prep
 %setup -q
 
+
 %package    devel
 Summary:    smartcard service
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
+
 %description devel
 smartcard service.
 
+
 %package -n smartcard-service-common
 Summary:    common smartcard service
 Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+
 
 %description -n smartcard-service-common
 common smartcard service.
 
+
 %package -n smartcard-service-common-devel
 Summary:    common smartcard service
 Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
 Requires:   smartcard-service-common = %{version}-%{release}
 
+
 %description -n smartcard-service-common-devel
 common smartcard service.
 
+
 %package -n smartcard-service-server
 Summary:    server smartcard service
 Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Requires:   smartcard-service-common = %{version}-%{release}
+
 
 %description -n smartcard-service-server
 smartcard service.
 
+
 %build
 mkdir obj-arm-limux-qnueabi
 cd obj-arm-limux-qnueabi
 %cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} %{?use_autostart} %{?use_gdbus} %{?test_client}
 #make %{?jobs:-j%jobs}
 
+
 %install
 cd obj-arm-limux-qnueabi
 %make_install
@@ -88,10 +100,11 @@ cd obj-arm-limux-qnueabi
        chmod 755 %{buildroot}/etc/init.d/smartcard-service-server
 %endif
 mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service %{buildroot}/usr/share/license/
+cp -af %{_builddir}/%{name}-%{version}/packaging/%{name} %{buildroot}/usr/share/license/
 cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-common %{buildroot}/usr/share/license/
 cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buildroot}/usr/share/license/
 
+
 %post
 /sbin/ldconfig
 %if 0%{!?use_autostart:1}
@@ -99,6 +112,7 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buil
        ln -sf /etc/init.d/smartcard-service-server /etc/rc.d/rc5.d/S79smartcard-service-server
 %endif
 
+
 %postun
 /sbin/ldconfig
 %if 0%{!?use_autostart:1}
@@ -106,24 +120,28 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buil
        rm -f /etc/rc.d/rc5.d/S79smartcard-service-server
 %endif
 
+
 %files
-%manifest smartcard-service.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libsmartcard-service.so.*
-/usr/share/license/smartcard-service
+%{_datadir}/license/%{name}
+
 
 %files  devel
 %manifest smartcard-service-devel.manifest
 %defattr(-,root,root,-)
-%{_includedir}/smartcard-service/*
+%{_includedir}/%{name}/*
 %{_libdir}/libsmartcard-service.so
-%{_libdir}/pkgconfig/smartcard-service.pc
+%{_libdir}/pkgconfig/%{name}.pc
+
 
 %files -n smartcard-service-common
 %manifest smartcard-service-common.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libsmartcard-service-common.so.*
-/usr/share/license/smartcard-service-common
+%{_datadir}/license/smartcard-service-common
+
 
 %files -n smartcard-service-common-devel
 %manifest smartcard-service-common-devel.manifest
@@ -132,16 +150,18 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buil
 %{_libdir}/libsmartcard-service-common.so
 %{_libdir}/pkgconfig/smartcard-service-common.pc
 
+
 %files -n smartcard-service-server
 %manifest smartcard-service-server.manifest
 %defattr(-,root,root,-)
 %{_bindir}/smartcard-daemon
+%{_datadir}/packages/smartcard-service-server.xml
 %if 0%{?test_client:1}
-       /usr/bin/smartcard-test-client
+       %{_bindir}/smartcard-test-client
 %endif
 %if 0%{?use_autostart:1}
-       /usr/share/dbus-1/services/org.tizen.smartcard_service.service
+       %{_datadir}/dbus-1/services/org.tizen.smartcard_service.service
 %else
-       /etc/init.d/smartcard-service-server
+       %{_sysconfdir}/init.d/smartcard-service-server
 %endif
-/usr/share/license/smartcard-service-server
+%{_datadir}/license/smartcard-service-server

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index fb7d606dda40308830077d2415536166a9db419e..8a0615556b6513c0b77c8711c79cf034e0e875b4 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -53,3 +53,4 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 IF("${USE_AUTOSTART}" STREQUAL "1")
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.smartcard_service.service DESTINATION share/dbus-1/services)
 ENDIF()
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/smartcard-service-server.xml DESTINATION share/packages)

diff --git a/server/smartcard-service-server.xml b/server/smartcard-service-server.xml
new file mode 100644 (file)
index 0000000..82c673a
--- /dev/null
+++ b/server/smartcard-service-server.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns="http://tizen.org/ns/packages"
+       package="smartcard-service-server"
+       version="0.1.20"
+       install-location="internal-only"
+       type="rpm">
+       <label>Smartcard Service Server</label>
+       <author email="constant.lee@samsung.com" href="www.samsung.com">Sangsoo Lee</author>
+       <author email="wonkyu.kwon@samsung.com" href="www.samsung.com">Wonkyu Kwon</author>
+       <description>Smartcard Service Server</description>
+       <ui-application appid="smartcard-service-server"
+               exec="/usr/bin/smartcard-daemon"
+               nodisplay="true"
+               multiple="false"
+               type="capp"
+               taskmanage="false"
+               mainapp="true">
+               <label>Smartcard Service Server</label>
+       </ui-application>
+</manifest>