Move fcitx4-config to base package to solve multiarch devel subpackage conflict

This commit is contained in:
Robin Lee 2013-06-21 14:26:05 +08:00
parent 0dab57952b
commit 4cf077716c
1 changed files with 5 additions and 2 deletions

View File

@ -5,7 +5,7 @@
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
Version: 4.2.7
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: http://code.google.com/p/%{name}/
@ -205,6 +205,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%{_bindir}/readPYMB
%{_bindir}/scel2org
%{_bindir}/txt2mb
%{_bindir}/fcitx4-config
%{_datadir}/applications/%{name}-skin-installer.desktop
%{_datadir}/%{name}/dbus/daemon.conf
%{_datadir}/applications/%{name}-configtool.desktop
@ -260,7 +261,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/fcitx4-config
%{_libdir}/libfcitx*.so
%{_libdir}/pkgconfig/fcitx*.pc
%{_includedir}/fcitx*
@ -318,6 +318,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
%changelog
* Fri Jun 21 2013 Robin Lee <cheeselee@fedoraproject.org> - 4.2.7-5
- Move fcitx4-config to base package to solve multiarch devel subpackage conflict
* Wed Jun 19 2013 Robin Lee <cheeselee@fedoraproject.org> - 4.2.7-4
- BR: lua-devel (BZ#974729)
- Move %%{_datadir}/gir-1.0/Fcitx-1.0.gir %%{_bindir}/fcitx4-config to devel