packages: scorched3d/scorched3d.spec - added -libpng.patch - release 6

[megabajt]

Author: megabajt                     Date: Thu Feb 11 19:14:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added -libpng.patch
- release 6

---- Files affected:
packages/scorched3d:
   scorched3d.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/scorched3d/scorched3d.spec
diff -u packages/scorched3d/scorched3d.spec:1.36 packages/scorched3d/scorched3d.spec:1.37
--- packages/scorched3d/scorched3d.spec:1.36	Tue Feb  9 02:22:13 2010
+++ packages/scorched3d/scorched3d.spec	Thu Feb 11 20:14:23 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Wersja 3D klasycznej DOS-owej gry Scorched Earth
 Name:		scorched3d
 Version:	42.1
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/scorched3d/Scorched3D-%{version}-src.tar.gz
@@ -11,6 +11,7 @@
 Source1:	%{name}.desktop
 Patch0:		%{name}-types.patch
 Patch1:		%{name}-openal.patch
+Patch2:		%{name}-libpng.patch
 URL:		http://www.scorched3d.co.uk/
 BuildRequires:	ImageMagick-coder-png
 BuildRequires:	OpenAL-devel >= 0.0.8
@@ -19,7 +20,6 @@
 BuildRequires:	SDL_net-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dos2unix
 BuildRequires:	expat-devel
 BuildRequires:	fftw3-single-devel >= 3.0
 BuildRequires:	freealut-devel
@@ -29,6 +29,8 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.533
+BuildRequires:	sed >= 4.0
 BuildRequires:	wxGTK2-devel >= 2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,9 +49,11 @@
 
 %prep
 %setup -q -n scorched
-dos2unix src/common/porting/windows.h
+%undos src/common/porting/windows.h
 %patch0 -p1
 %patch1 -p1
+%undos src/common/image/ImagePng.cpp
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -95,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2010/02/11 19:14:23  megabajt
+- added -libpng.patch
+- release 6
+
 Revision 1.36  2010/02/09 01:22:13  sparky
 - BR: expat-devel, libjpeg-devel, libpng-devel, pkgconfig
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scorched3d/scorched3d.spec?r1=1.36&r2=1.37&f=u