diff --git a/kde-l10n.spec b/kde-l10n.spec index f283f20..0742115 100644 --- a/kde-l10n.spec +++ b/kde-l10n.spec @@ -3,7 +3,7 @@ Name: kde-l10n Summary: Internationalization support for KDE Version: 4.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Url: http://www.kde.org License: LGPLv2 @@ -848,6 +848,11 @@ done # (get this fixed upstream) -- Rex rm -rfv %{buildroot}%{_datadir}/locale/*/flag.png +# bz#963547, get rid of files (Serbian lang) which cause file conflict in k3b, konversation, ktorrent +# bluedevil, it needs to be fixed in upstream in the future +for f in libk3b.mo libk3bdevice.mo ktorrent.mo konversation.mo bluedevil.mo k3b.mo kio_videodvd.mo ; do + rm -f %{buildroot}%{_datadir}/locale/sr@*/LC_MESSAGES/$f +done %files # empty @@ -1463,6 +1468,9 @@ rm -rfv %{buildroot}%{_datadir}/locale/*/flag.png %changelog +* Thu May 16 2013 Than Ngo - 4.10.3-2 +- bz#963547, fix file conflicts + * Mon May 06 2013 Than Ngo - 4.10.3-1 - 4.10.3