Merge branch 'master' into f16

This commit is contained in:
Fedora 2011-12-25 01:26:48 +08:00
commit 0bc7823e8d
3 changed files with 12 additions and 3 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/fcitx-4.0.1_all.tar.gz /fcitx-4.0.1_all.tar.gz
/fcitx-4.1.0_all.tar.bz2 /fcitx-4.1.0_all.tar.bz2
/fcitx-4.1.1_all.tar.bz2 /fcitx-4.1.1_all.tar.bz2
/fcitx-4.1.2_all.tar.bz2

View File

@ -4,8 +4,8 @@
Name: fcitx Name: fcitx
Summary: Free Chinese Input Toy for X (XIM) Summary: Free Chinese Input Toy for X (XIM)
Version: 4.1.1 Version: 4.1.2
Release: 2%{?dist} Release: 1%{?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,6 +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}
%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
@ -168,7 +169,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%doc AUTHORS ChangeLog THANKS TODO COPYING %doc AUTHORS ChangeLog THANKS TODO COPYING
#%doc __doc/* #%doc __doc/*
%config %{_xinputconf} %config %{_xinputconf}
%{_bindir}/* %{_bindir}/fcitx-*
%{_bindir}/fcitx
%{_datadir}/applications/%{name}-kimpanel.desktop %{_datadir}/applications/%{name}-kimpanel.desktop
%{_datadir}/applications/%{name}-configtool.desktop %{_datadir}/applications/%{name}-configtool.desktop
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
@ -186,6 +188,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%files libs %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %doc
%{_bindir}/fcitx4-config
%{_libdir}/libfcitx*.so.* %{_libdir}/libfcitx*.so.*
%{_libdir}/%{name}/*.so %{_libdir}/%{name}/*.so
@ -248,6 +251,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%changelog %changelog
* Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-1
- Update to 4.1.2
- move fcitx4-config to devel
* Fri Sep 09 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.1-2 * Fri Sep 09 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.1-2
- Update xinput-fcitx - Update xinput-fcitx
- Add fcitx-gtk3 as fcitx requires - Add fcitx-gtk3 as fcitx requires

View File

@ -1,3 +1,4 @@
844f6a382ca970d6c3343e12148be641 fcitx-4.0.1_all.tar.gz 844f6a382ca970d6c3343e12148be641 fcitx-4.0.1_all.tar.gz
f2dc0a64567207fa6be686faf0ccab66 fcitx-4.1.0_all.tar.bz2 f2dc0a64567207fa6be686faf0ccab66 fcitx-4.1.0_all.tar.bz2
d05c606ea5a4ff142e5986c191fef97f fcitx-4.1.1_all.tar.bz2 d05c606ea5a4ff142e5986c191fef97f fcitx-4.1.1_all.tar.bz2
592bc4b18e19b884df78a266007a70f8 fcitx-4.1.2_all.tar.bz2