From 8c8eabf8451c91635edf4cf48b20bc59210037ef Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Sat, 16 Feb 2013 11:40:23 +0800 Subject: [PATCH] move data files to libdir --- data/Makefile.am | 2 +- libpinyin.pc.in | 3 +-- libpinyin.spec.in | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index f2564a5..e274473 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = $(textual_model_data) libpinyin_db_DATA = $(binary_model_data) -libpinyin_dbdir = $(pkgdatadir)/data +libpinyin_dbdir = $(libdir)/libpinyin/data CLEANFILES = $(binary_model_data) diff --git a/libpinyin.pc.in b/libpinyin.pc.in index 45c61c4..ea08282 100644 --- a/libpinyin.pc.in +++ b/libpinyin.pc.in @@ -2,8 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -datadir=@datadir@ -pkgdatadir=@datadir@/libpinyin +pkgdatadir=@libdir@/libpinyin libpinyinincludedir=${includedir}/libpinyin-@VERSION@ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@ diff --git a/libpinyin.spec.in b/libpinyin.spec.in index c94a005..d75c5fd 100644 --- a/libpinyin.spec.in +++ b/libpinyin.spec.in @@ -8,7 +8,7 @@ URL: https://github.com/libpinyin/libpinyin Source0: https://github.com/downloads/libpinyin/libpinyin/%{name}-%{version}.tar.gz BuildRequires: db4-devel, glib2-devel -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data%{?_isa} = %{version}-%{release} %description The libpinyin project aims to provide the algorithms core -- 2.7.4