From 41a6458b731fd4bfbc8d6aaa456cde65403a7c51 Mon Sep 17 00:00:00 2001 From: Sungmin Kwak Date: Tue, 20 Jan 2015 21:28:59 +0900 Subject: [PATCH] Fix for ISF manifest DB change. Change-Id: I4dff33dc1713a369b1e58a038ce047a6a7218153 --- Makefile.am | 11 +++++++---- configure.ac | 6 ++++++ ise-engine-default.xml | 13 +++++++++++++ packaging/ise-engine-default.spec | 1 + 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100755 ise-engine-default.xml diff --git a/Makefile.am b/Makefile.am index ffe1025..cf3ca36 100644 --- 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 9d1a6fa..c48685e 100644 --- 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 index 0000000..c35592c --- /dev/null +++ b/ise-engine-default.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec index ef62375..e8420b8 100644 --- 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} -- 2.7.4