[poedit] Fix file conflict (#866058)

[Christoph Wickert]

commit a2ff1fad6fb6d6a008b40ad592ada2030b781784
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Oct 15 18:38:15 2012 +0200

    Fix file conflict (#866058)

 poedit.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/poedit.spec b/poedit.spec
index 3544454..d19ddfa 100644
--- a/poedit.spec
+++ b/poedit.spec
@@ -1,6 +1,6 @@
 Name:           poedit
 Version:        1.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Tools
@@ -60,6 +60,8 @@ desktop-file-install \
     $RPM_BUILD_ROOT%{_datadir}/applications/poedit.desktop
 %{find_lang} poedit
 
+# work around for https://bugzilla.redhat.com/show_bug.cgi?id=866058
+rm -f %{_datadir}/icons/hicolor/16x16/mimetypes/text-x-gettext-translation.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +96,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Oct 15 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.4-2
+- Fix file conflict (#866058)
+
 * Thu Oct 11 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.4-1
 - Update to 1.5.4