Fix for ISF manifest DB change.

Change-Id: I4dff33dc1713a369b1e58a038ce047a6a7218153

diff --git a/Makefile.am b/Makefile.am
index ffe102592fafb9bd4ad05673f3a49b2b26df090b..cf3ca36fe83eb9c8f3911689e4cc9cf2f0203457 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,10 @@ AUX_DIST              = $(ac_aux_dir)/config.guess \
                        $(ac_aux_dir)/depcomp
 
 EXTRA_DIST = \
-       ChangeLog\
-       README  \
-       config.rpath    \
-       mkinstalldirs   \
+       ChangeLog \
+       README \
+       config.rpath \
+       mkinstalldirs \
        bootstrap
 
 ## @end 1
@@ -43,6 +43,9 @@ CLEANFILES            = *.bak src/*.bak
 ## @end 1
 ACLOCAL                        = aclocal -I $(ac_aux_dir)
 
+pkgdir = $(ISF_PKGDIR)
+pkg_DATA       = ise-engine-default.xml
+
 ## @start 2
 ## docdir              = $(top_builddir)/doc
 

diff --git a/configure.ac b/configure.ac
index 9d1a6fa77a04a50d4a0b11f21a280d0c149c39e4..c48685ea1e6282caa3850b591ec6aa395105cad2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ if test "$enable_debug" = "yes"; then
 fi
 
 ISF_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
+ISF_PKGDIR=`$PKG_CONFIG --variable=pkgdir scim`
 ISF_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
 ISF_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
 ISF_LIBDIR=`$PKG_CONFIG --variable=libdir scim`
@@ -82,6 +83,10 @@ if test "x$ISF_ICONDIR" = "x"; then
   ISF_ICONDIR=${datadir}/scim/icons
 fi
 
+if test "x$ISF_PKGDIR" = "x"; then
+  ISF_PKGDIR=${datadir}/packages
+fi
+
 if test "x$ISF_MODULEDIR" = "x"; then
   ISF_MODULEDIR=${libdir}/scim-1.0
 fi
@@ -95,6 +100,7 @@ if test "x$ISF_LIBDIR" = "x"; then
 fi
 
 AC_SUBST(ISF_ICONDIR)
+AC_SUBST(ISF_PKGDIR)
 AC_SUBST(ISF_MODULEDIR)
 AC_SUBST(ISF_DATADIR)
 AC_SUBST(ISF_LIBDIR)

diff --git a/ise-engine-default.xml b/ise-engine-default.xml
new file mode 100755 (executable)
index 0000000..c35592c
--- /dev/null
+++ b/ise-engine-default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="ise-engine-default" type="rpm" version="1.0.0" install-location="internal-only" support-mode="screen-reader">
+<author/>
+<description/>
+<label>Default keyboard</label>
+<icon/>
+<ui-application appid="d75857a5-4148-4745-89e2-1da7ddaf7999" exec="/usr/lib/scim-1.0/scim-launcher" nodisplay="true" taskmanage="false" multiple="false" type="capp" hw-acceleration="use-system-setting" mainapp="true">
+    <category name="http://tizen.org/category/ime"/>
+    <label>Default keyboard</label>
+    <label xml:lang="en-gb">Default keyboard</label>
+    <icon/>
+</ui-application>
+</manifest>

diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec
index ef623751f7935fe63a071ac6871e92a8ae6d52bd..e8420b8706c38765517b5eae26941543316dc974 100644 (file)
--- a/packaging/ise-engine-default.spec
+++ b/packaging/ise-engine-default.spec
@@ -31,4 +31,5 @@ install -m0644 %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}
 %defattr(-,root,root,-)
 %{_libdir}/scim-1.0/1.4.0/IMEngine/ise-engine-default.so
 %{_datadir}/scim/icons/isf-default.png
+%{_datadir}/packages/*
 %{_datadir}/license/%{name}