- fixed install problem with tent.png

Changed files:
    wesnoth.spec -> 1.90

diff --git a/wesnoth.spec b/wesnoth.spec
index 8c4af50106e04c7dcc561a021e2f8d69edbd6087..6427889d584c53d3366ad1fb33895efc35f084d8 100644 (file)
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -2,9 +2,6 @@
 # - rename language files sr@latin to sr@Latn and include them
 # - use desktop file included with project (consider which one are better)
 # - dont know what should I do with sr@latin man pages
-# - /usr/share/wesnoth/data/core/images/terrain/tent.png: ERROR: 
-#      Macintosh HFS Extended version 61389 data (unclean) vasprintf failed 
-#      (Invalid or incomplete multibyte or wide character)
 # Conditional build
 %bcond_without server  # without server
 %bcond_without tools   # without tools
@@ -26,6 +23,8 @@ Source3:      %{name}d.init
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-locale_dir.patch
 URL:           http://www.wesnoth.org/
+# because of png
+BuildRequires: ImageMagick
 BuildRequires: SDL-devel >= 1.2.7
 BuildRequires: SDL_image-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
@@ -116,6 +115,11 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/var/run/wesnothd,/etc/
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# Invalid or incomplete multibyte or wide character - but after convert it's OK
+mv $RPM_BUILD_ROOT%{_datadir}/wesnoth/data/core/images/terrain/tent.png{,-}
+convert $RPM_BUILD_ROOT%{_datadir}/wesnoth/data/core/images/terrain/tent.png{-,}
+rm $RPM_BUILD_ROOT%{_datadir}/wesnoth/data/core/images/terrain/tent.png-
+
 # install additional docs
 install changelog README  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{changelog,README}