Merge branch 'master' into el6

This commit is contained in:
Ding-Yi Chen 2012-11-26 18:43:39 +10:00
commit 428954db07
3 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/ibus-table-chinese-1.4.0-Source.tar.gz /ibus-table-chinese-1.4.0-Source.tar.gz
/ibus-table-chinese-1.4.2-Source.tar.gz /ibus-table-chinese-1.4.2-Source.tar.gz
/ibus-table-chinese-1.4.4-Source.tar.gz /ibus-table-chinese-1.4.4-Source.tar.gz
/ibus-table-chinese-1.4.5-Source.tar.gz

View File

@ -3,7 +3,7 @@
%global ibus_icons_dir %{_datadir}/ibus-table/icons %global ibus_icons_dir %{_datadir}/ibus-table/icons
%global createdb ibus-table-createdb %global createdb ibus-table-createdb
Name: ibus-table-chinese Name: ibus-table-chinese
Version: 1.4.4 Version: 1.4.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Chinese input tables for IBus Summary: Chinese input tables for IBus
Summary(zh_CN): 中文码表输入法 Summary(zh_CN): 中文码表输入法
@ -312,7 +312,7 @@ YongMa input method.
%install %install
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT
# We install document using %doc # We install document using %doc
(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.4 (cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.5
rm -rf AUTHORS README ChangeLog COPYING README rm -rf AUTHORS README ChangeLog COPYING README
) )
@ -433,7 +433,7 @@ YongMa input method.
%changelog %changelog
* Mon Nov 26 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.4-1 * Mon Nov 26 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.5-1
- Table build scripts has been refactored. - Table build scripts has been refactored.
- cmake-fedora is added as submodule. - cmake-fedora is added as submodule.
- Fixed Bug 855250 - Change the default filtering for Quick and Cangjie by - Fixed Bug 855250 - Change the default filtering for Quick and Cangjie by

View File

@ -1 +1 @@
68a07fd8de1992c3453a74a3a751a362 ibus-table-chinese-1.4.4-Source.tar.gz 1dd234b1cc891d43fb9f63e657c4ee81 ibus-table-chinese-1.4.5-Source.tar.gz