Merge branch 'master' into f16
This commit is contained in:
commit
eec8d37a21
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/fcitx-4.1.0_all.tar.bz2
|
||||
/fcitx-4.1.1_all.tar.bz2
|
||||
/fcitx-4.1.2_all.tar.bz2
|
||||
/fcitx-4.2.0_dict.tar.bz2
|
||||
|
21
fcitx.spec
21
fcitx.spec
@ -4,12 +4,12 @@
|
||||
|
||||
Name: fcitx
|
||||
Summary: Free Chinese Input Toy for X (XIM)
|
||||
Version: 4.1.2
|
||||
Release: 3%{?dist}
|
||||
Version: 4.2.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: User Interface/Desktops
|
||||
URL: http://code.google.com/p/%{name}/
|
||||
Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.bz2
|
||||
Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_dict.tar.bz2
|
||||
Source1: xinput-%{name}
|
||||
BuildRequires: pango-devel, dbus-devel, opencc-devel
|
||||
BuildRequires: wget, intltool, chrpath, sysconftool, opencc
|
||||
@ -123,7 +123,7 @@ install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
|
||||
|
||||
desktop-file-install --delete-original \
|
||||
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
||||
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-kimpanel.desktop
|
||||
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-skin-installer.desktop
|
||||
|
||||
desktop-file-install --delete-original \
|
||||
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
||||
@ -179,7 +179,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
|
||||
%{_bindir}/scel2org
|
||||
%{_bindir}/txt2mb
|
||||
%{_datadir}/applications/%{name}-skin-installer.desktop
|
||||
%{_datadir}/applications/%{name}-kimpanel.desktop
|
||||
%{_datadir}/applications/%{name}-configtool.desktop
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/mime/packages/x-fskin.xml
|
||||
@ -205,13 +204,14 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
|
||||
%defattr(-,root,root,-)
|
||||
%doc
|
||||
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/16x16/status/*.png
|
||||
%{_datadir}/icons/hicolor/24x24/status/*.png
|
||||
%{_datadir}/icons/hicolor/48x48/status/*.png
|
||||
%{_datadir}/icons/hicolor/32x32/status/*.png
|
||||
%{_datadir}/icons/hicolor/scabable/status/*.svg
|
||||
%{_datadir}/%{name}/data/
|
||||
%{_datadir}/%{name}/configdesc/
|
||||
%{_datadir}/%{name}/pinyin/
|
||||
@ -219,6 +219,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
|
||||
%{_datadir}/%{name}/addon/
|
||||
%{_datadir}/%{name}/table/wbx.conf
|
||||
%{_datadir}/%{name}/table/wbx.mb
|
||||
%{_datadir}/%{name}/inputmethod/*.conf
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
@ -260,6 +261,12 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Feb 04 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.0-1
|
||||
- Upgrade to fcitx-4.2.0
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Sun Dec 25 2011 Liang Suilong <liangsuilong@gmail.com> - 4.1.2-3
|
||||
- Fix the spec
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user