diff --git a/.gitignore b/.gitignore index 40484c2..9215037 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /libpinyin-1.9.91.tar.gz /libpinyin-1.9.92.tar.gz /libpinyin-2.0.0.tar.gz +/libpinyin-2.0.91.tar.gz diff --git a/libpinyin-2.0.x-head.patch b/libpinyin-2.1.x-head.patch similarity index 100% rename from libpinyin-2.0.x-head.patch rename to libpinyin-2.1.x-head.patch diff --git a/libpinyin.spec b/libpinyin.spec index 30a611b..4f1aa33 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,7 +1,7 @@ %global snapshot 0 Name: libpinyin -Version: 2.0.0 +Version: 2.0.91 Release: 1%{?dist} Summary: Library to deal with pinyin @@ -9,7 +9,7 @@ License: GPLv3+ URL: https://github.com/libpinyin/libpinyin Source0: http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz %if %snapshot -Patch0: libpinyin-2.0.x-head.patch +Patch0: libpinyin-2.1.x-head.patch %endif BuildRequires: kyotocabinet-devel, glib2-devel @@ -23,6 +23,8 @@ for intelligent sentence-based Chinese pinyin input methods. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} +Provides: libzhuyin-devel = %{version}-%{release} +Obsoletes: libzhuyin-devel < %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -43,6 +45,13 @@ Requires: %{name} = %{version}-%{release} %description tools The %{name}-tools package contains tools. +%package -n libzhuyin +Summary: Library to deal with zhuyin +Requires: %{name} = %{version}-%{release} + +%description -n libzhuyin +The libzhuyin package contains libzhuyin compatibility library. + %prep %setup -q @@ -52,7 +61,9 @@ The %{name}-tools package contains tools. %endif %build -%configure --disable-static --with-dbm=KyotoCabinet +%configure --disable-static \ + --with-dbm=KyotoCabinet \ + --enable-libzhuyin make %{?_smp_mflags} %check @@ -70,15 +81,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files %doc AUTHORS COPYING README -%{_libdir}/*.so.* +%{_libdir}/libpinyin*.so.* %dir %{_libdir}/libpinyin %files devel %doc %dir %{_includedir}/libpinyin-%{version} %{_includedir}/libpinyin-%{version}/* -%{_libdir}/*.so +%{_libdir}/libpinyin.so %{_libdir}/pkgconfig/libpinyin.pc +%{_libdir}/libzhuyin.so +%{_libdir}/pkgconfig/libzhuyin.pc %files data %doc @@ -90,8 +103,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_bindir}/gen_unigram %{_mandir}/man1/*.1.* +%files -n libzhuyin +%{_libdir}/libzhuyin*.so.* %changelog +* Thu Jun 8 2017 Peng Wu - 2.0.91-1 +- Update to 2.0.91 +- merge libzhuyin code + * Thu Apr 20 2017 Peng Wu - 2.0.0-1 - Update to 2.0.0 diff --git a/sources b/sources index caf51c6..ff20462 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.0.0.tar.gz) = 89805477d3f219c3a324bc2091edb940b74eca2b2e9b842552492fe4a6b6c0bf05bb04414b5decf455fd8c9a429ab1c3c2a8fccd1342c9a4df6c4c2a878281a8 +SHA512 (libpinyin-2.0.91.tar.gz) = 597c8813d498550cf4b613cc944d76826e5df9030c93f8c223dba73f33584a0edc98090a59b9da3b48f9d2efc2edc1758e44c6856287e6524760fe9318129503