From 5940250360c06324be9e31bd1072328137a47a51 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 1 Jun 2012 15:00:58 +0800 Subject: [PATCH] fixes rpm build --- autogen.sh | 2 +- ibus-libpinyin.spec.in | 9 +++++++-- setup/Makefile.am | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 660c4b8..87a9ea8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="ibus-pinyin" +PKG_NAME="ibus-libpinyin" (test -f $srcdir/configure.ac \ && test -f $srcdir/README ) || { diff --git a/ibus-libpinyin.spec.in b/ibus-libpinyin.spec.in index 651d215..a6e1379 100644 --- a/ibus-libpinyin.spec.in +++ b/ibus-libpinyin.spec.in @@ -13,7 +13,6 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: sqlite-devel BuildRequires: libuuid-devel -BuildRequires: boost-devel >= 1.39 BuildRequires: ibus-devel >= 1.3 BuildRequires: libpinyin-devel >= 0.6.0 @@ -29,7 +28,10 @@ The Chinese Pinyin and Bopomof input methods for IBus platform. %setup -q %build -%configure --disable-static +%configure --disable-static \ + --enable-opencc \ + --disable-boost + # make -C po update-gmo make %{?_smp_mflags} @@ -50,7 +52,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/@PACKAGE@/phrases.txt %{_datadir}/@PACKAGE@/icons %{_datadir}/@PACKAGE@/setup +%{_datadir}/@PACKAGE@/base.lua +%{_datadir}/@PACKAGE@/db/english.db %dir %{_datadir}/@PACKAGE@ +%dir %{_datadir}/@PACKAGE@/db %{_datadir}/ibus/component/* %changelog diff --git a/setup/Makefile.am b/setup/Makefile.am index 7ade837..7395c98 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -18,13 +18,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -setup_pinyin_PYTHON = \ +setup_libpinyin_PYTHON = \ main2.py \ version.py \ ibus-libpinyin-preferences.ui \ $(NULL) -setup_pinyindir = $(datadir)/ibus-pinyin/setup +setup_libpinyindir = $(datadir)/ibus-libpinyin/setup libexec_SCRIPTS = \ ibus-setup-libpinyin \ -- 2.7.4