SPECS: wesnoth.spec - fixed install problem with tent.png

[Szymon Siwek]

On Tue, Aug 26, 2008 at 07:58:18PM +0200, uzsolt wrote:
> Author: uzsolt                       Date: Tue Aug 26 17:58:18 2008 GMT
> Module: SPECS                         Tag: HEAD
> ---- Log message:
> - fixed install problem with tent.png
> 
> ---- Files affected:
> SPECS:
>    wesnoth.spec (1.89 -> 1.90) 
> 
> ---- Diffs:
> 
> ================================================================
> Index: SPECS/wesnoth.spec
> diff -u SPECS/wesnoth.spec:1.89 SPECS/wesnoth.spec:1.90
> --- SPECS/wesnoth.spec:1.89	Tue Aug 26 01:11:57 2008
> +++ SPECS/wesnoth.spec	Tue Aug 26 19:58:12 2008
> @@ -3,9 +3,6 @@
>  # - rename language files sr at latin to sr at Latn and include them
>  # - use desktop file included with project (consider which one are better)
>  # - dont know what should I do with sr at 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

What's going on? tent.png looks like proper PNG file. wesnoth builds
without errors. Is it some problem with Zsolt's filesystem (Macintosh HFS,
I guess)?

> @@ -27,6 +24,8 @@
>  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
> @@ -117,6 +116,11 @@
>  %{__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}

Missing BR: ImageMagick-coder-png (if converting is really required)

-- 
Szymon Siwek