From bd69c770f986d9ae7d0c9285783866cef4150f1f Mon Sep 17 00:00:00 2001 From: Sungmin Kwak Date: Tue, 20 Jan 2015 21:34:09 +0900 Subject: [PATCH] Fix for ISF manifest DB change. Change-Id: I807e1df73d54ea7760d392821f5c53ee021f3ad5 --- Makefile.am | 3 +++ configure.ac | 7 +++++++ ise-engine-sunpinyin.xml | 13 +++++++++++++ packaging/ise-engine-sunpinyin.spec | 1 + 4 files changed, 24 insertions(+) create mode 100755 ise-engine-sunpinyin.xml mode change 100644 => 100755 packaging/ise-engine-sunpinyin.spec diff --git a/Makefile.am b/Makefile.am index 2031c05..96bf175 100755 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,9 @@ pkgconfig_DATA = sunpinyin-2.0.pc ACLOCAL = aclocal -I m4 ACLOCAL_AMFLAGS = -I m4 +pkgdir = $(SUNPINYIN_PKG_DIR) +pkg_DATA = ise-engine-sunpinyin.xml + .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index f21208d..ecb1d72 100755 --- a/configure.ac +++ b/configure.ac @@ -87,6 +87,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` @@ -95,6 +96,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 @@ -108,11 +113,13 @@ if test "x$ISF_LIBDIR" = "x"; then fi SUNPINYIN_ICON_DIR=${ISF_ICONDIR} +SUNPINYIN_PKG_DIR=${ISF_PKGDIR} SUNPINYIN_MODULE_DIR=${ISF_MODULEDIR} SUNPINYIN_DATA_DIR=${ISF_DATADIR}/ise-engine-sunpinyin SUNPINYIN_LIB_DIR=${ISF_LIBDIR} AC_SUBST(SUNPINYIN_ICON_DIR) +AC_SUBST(SUNPINYIN_PKG_DIR) AC_SUBST(SUNPINYIN_MODULE_DIR) AC_SUBST(SUNPINYIN_DATA_DIR) AC_SUBST(SUNPINYIN_LIBD_IR) diff --git a/ise-engine-sunpinyin.xml b/ise-engine-sunpinyin.xml new file mode 100755 index 0000000..1bf514a --- /dev/null +++ b/ise-engine-sunpinyin.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packaging/ise-engine-sunpinyin.spec b/packaging/ise-engine-sunpinyin.spec old mode 100644 new mode 100755 index 20a23cb..2068a14 --- a/packaging/ise-engine-sunpinyin.spec +++ b/packaging/ise-engine-sunpinyin.spec @@ -53,6 +53,7 @@ cat %{_builddir}/%{buildsubdir}/OPENSOLARIS.LICENSE >> %{buildroot}%{_datadir}/l %defattr(-,root,root,-) %{_datadir}/scim/icons/sunpinyin_logo.png %{_datadir}/scim/ise-engine-sunpinyin/* +%{_datadir}/packages/* %{_libdir}/scim-1.0/1.4.0/IMEngine/ise-engine-sunpinyin.so %{_libdir}/libsunpinyin*.so /usr/share/license/%{name} -- 2.7.4