diff --git a/fcitx.changes b/fcitx.changes index 4c9cef9..8f38f1e 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Apr 18 04:25:12 UTC 2014 - i@marguerite.su - -- split two sub-packages: fcitx-module-autoeng-orig and - fcitx-module-punc-orig to avoid conflicts with sogou-pinyin - ------------------------------------------------------------------- Thu Apr 17 16:10:11 UTC 2014 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index aaccf62..3a7d05c 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -80,8 +80,6 @@ BuildRequires: libicu-devel BuildRequires: libxml2-devel BuildRequires: xz Requires: %{name}-gtk2 = %{version}-%{release} -Requires: fcitx-module-autoeng = %{version} -Requires: fcitx-module-punc = %{version} Requires: lib%{name}%{libver} = %{version}-%{release} %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} Requires: %{name}-gtk3 = %{version}-%{release} @@ -129,7 +127,6 @@ Shared libraries for Fcitx input method framework. Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} -Requires: fcitx-module-punc-devel = %{version} %description devel Development header files for Fcitx input method framework. @@ -187,36 +184,6 @@ QT4 input module for Fcitx input method framework. %endif -%package -n fcitx-module-autoeng-orig -Summary: AutoEng module for fcitx input method -Group: System/I18n/Chinese -Requires: %{name} = %{version} -Provides: fcitx-module-autoeng = %{version} -Obsoletes: fcitx-module-autoeng < %{version} - -%description -n fcitx-module-autoeng-orig -This package provides an AutoEng module for fcitx. - -%package -n fcitx-module-punc-orig -Summary: Punc module for fcitx input method -Group: System/I18n/Chinese -Requires: %{name} = %{version} -Provides: fcitx-module-punc = %{version} -Obsoletes: fcitx-module-punc < %{version} - -%description -n fcitx-module-punc-orig -This package provides a Punc module for fcitx. - -%package -n fcitx-module-punc-orig-devel -Summary: Development headers for fcitx-module-punc-orig -Group: Development/Libraries/C and C++ -Requires: fcitx-module-punc-orig = %{version} -Provides: fcitx-module-punc-devel = %{version} -Obsoletes: fcitx-module-punc-devel < %{Version} - -%description -n fcitx-module-punc-orig-devel -Development headers for fcitx-module-punc-orig. - %package quwei Summary: Chinese Zone-bit(QuWei) engine for %{name} Group: System/I18n/Chinese @@ -632,20 +599,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %exclude %{_datadir}/%{name}/table/* %exclude %{_datadir}/%{name}/imicon/* %exclude %{_datadir}/%{name}/inputmethod/* -%exclude %{_datadir}/%{name}/addon/%{name}-autoeng.conf -%exclude %{_datadir}/%{name}/addon/%{name}-punc.conf %exclude %{_datadir}/%{name}/addon/%{name}-pinyin.conf %exclude %{_datadir}/%{name}/addon/%{name}-table.conf %exclude %{_datadir}/%{name}/addon/%{name}-qw.conf -%exclude %{_datadir}/%{name}/configdesc/%{name}-autoeng.desc %exclude %{_datadir}/%{name}/configdesc/%{name}-pinyin.desc %exclude %{_datadir}/%{name}/configdesc/table.desc -%exclude %{_datadir}/%{name}/data/AutoEng.dat -%exclude %{_datadir}/%{name}/data/punc.mb.zh_CN -%exclude %{_datadir}/%{name}/data/punc.mb.zh_HK -%exclude %{_datadir}/%{name}/data/punc.mb.zh_TW -%exclude %{_libdir}/%{name}/fcitx-autoeng.so -%exclude %{_libdir}/%{name}/fcitx-punc.so %exclude %{_libdir}/%{name}/fcitx-pinyin.so %exclude %{_libdir}/%{name}/fcitx-table.so %exclude %{_libdir}/%{name}/fcitx-qw.so @@ -679,25 +637,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %endif -%files -n fcitx-module-autoeng-orig -%defattr(-,root,root) -%{_libdir}/%{name}/%{name}-autoeng.so -%{_datadir}/%{name}/addon/%{name}-autoeng.conf -%{_datadir}/%{name}/configdesc/%{name}-autoeng.desc -%{_datadir}/%{name}/data/AutoEng.dat - -%files -n fcitx-module-punc-orig -%defattr(-,root,root) -%{_libdir}/%{name}/%{name}-punc.so -%{_datadir}/%{name}/addon/%{name}-punc.conf -%{_datadir}/%{name}/data/punc.mb.zh_CN -%{_datadir}/%{name}/data/punc.mb.zh_HK -%{_datadir}/%{name}/data/punc.mb.zh_TW - -%files -n fcitx-module-punc-orig-devel -%defattr(-,root,root) -%{_includedir}/fcitx/module/punc - %files quwei %defattr(-,root,root) %{_libdir}/%{name}/%{name}-qw.so @@ -813,7 +752,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} %{_datadir}/gir-1.0/Fcitx-1.0.gir %endif -%exclude %{_includedir}/fcitx/module/punc %if 0%{?suse_version} > 1110 || 0%{?fedora_version}