Merge branch 'master' into f16

This commit is contained in:
Fedora 2011-12-25 21:54:21 +08:00
commit 01444a4a28

View File

@ -5,7 +5,7 @@
Name: fcitx Name: fcitx
Summary: Free Chinese Input Toy for X (XIM) Summary: Free Chinese Input Toy for X (XIM)
Version: 4.1.2 Version: 4.1.2
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
URL: http://code.google.com/p/%{name}/ URL: http://code.google.com/p/%{name}/
@ -23,7 +23,7 @@ Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release}
Requires: %{name}-gtk22 = %{version}-%{release} Requires: %{name}-gtk2 = %{version}-%{release}
%description %description
FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese
@ -260,6 +260,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%changelog %changelog
* Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-3
- Fix the spec
* Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-2 * Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-2
- Fix the spec - Fix the spec