X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=decopter.spec;h=a28a67c264a7446b8f49051df5cccd10de081079;hb=refs%2Ftags%2FAC-STABLE;hp=f3149034b7998212ade3d32d2ec46cd562673617;hpb=2e269d7806981419ed00507a385acafd0c64f28d;p=packages%2Fdecopter.git

diff --git a/decopter.spec b/decopter.spec
index f314903..a28a67c 100644
--- a/decopter.spec
+++ b/decopter.spec
@@ -2,19 +2,22 @@
 Summary:	Unrealistic helicopter simulator
 Summary(pl):	Nierealistyczny symulator helikoptera
 Name:		decopter
-Version:	0.2.9
-Release:	1
+Version:	0.2.11
+Release:	2
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5:	802d2fe2f187bab388ef2f9fd37871c8
 Source1:	http://dl.sourceforge.net/%{name}/%{name}-textures-%{_textures_ver}.tar.gz
+# Source1-md5:	95b1311447f1ec91869986550dc9d33b
 Source2:	%{name}.desktop
 Source3:	%{name}.png
 Patch0:		%{name}-paths.patch
+Patch1:		%{name}-c++.patch
 URL:		http://decopter.sourceforge.net/
-Buildrequires:	OpenGL-devel
+BuildRequires:	OpenGL-devel
 BuildRequires:	SDL-devel
-Buildrequires:	SDL_image-devel
+BuildRequires:	SDL_image-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -28,27 +31,30 @@ decopter jest nierealistycznym symulatorem helikoptera. Nie jest on
 grywalny, mo¿na tylko lataæ w ko³o.
 
 %prep
-%setup -q -a 1
+%setup -q -a1
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__make}
+%{__make} \
+	CXX="%{__cxx}" \
+	CXXFLAGS="`sdl-config --cflags` -I/usr/X11R6/include -Wall %{rpmcflags} %{!?debug:-fomit-frame-pointer}" \
+	LDFLAGS="`sdl-config --libs` -L%{_prefix}/X11R6/%{_lib} -lSDL_image -lGL -lGLU -lstdc++"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_applnkdir}/Games,%{_pixmapsdir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/{3D,desc,maps,textures}
 
 install fly $RPM_BUILD_ROOT%{_bindir}/decopter
 install generate_textures $RPM_BUILD_ROOT%{_bindir}
-install landscape_texture_browser $RPM_BUILD_ROOT%{_bindir}
 
 install 3D/* $RPM_BUILD_ROOT%{_datadir}/%{name}/3D
 install desc/* $RPM_BUILD_ROOT%{_datadir}/%{name}/desc
 install maps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/maps
 install textures/* $RPM_BUILD_ROOT%{_datadir}/%{name}/textures
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Games
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
@@ -62,5 +68,5 @@ echo "NOTE: Run generate_textures before first play"
 %doc BUGS README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
-%{_applnkdir}/Games/*
+%{_desktopdir}/*
 %{_pixmapsdir}/*