X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=teeworlds.spec;h=91772e43a0c1b7c47d761436dd70de916d827e0f;hb=02e2a3030d1025a14387a4df4cb7b71139598faa;hp=b65f4b58cdd0e93772bae22f1d50995a4e250f10;hpb=b820fe6f85fe9738121814481698c41432fc837d;p=packages%2Fteeworlds.git

diff --git a/teeworlds.spec b/teeworlds.spec
index b65f4b5..91772e4 100644
--- a/teeworlds.spec
+++ b/teeworlds.spec
@@ -1,29 +1,31 @@
 #
 # TODO:
-# - rename to teeworlds.spec on CVS
-# - exclude bam to separate spec file and BR it
+# - optflags
 Summary:	Cute little buggers with guns
-Summary(pl.UTF-8):	Takie fajne robaczki z gnatami.
+Summary(pl.UTF-8):	Takie fajne robaczki z gnatami
 Name:		teeworlds
-Version:	0.4.2
+Version:	0.6.0
 Release:	1
 License:	distributable
 Group:		X11/Applications/Games
 Source0:	http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
-# Source0-md5:	97f1833ea94015b472a0f828003693b8
-Source1:	http://www.teeworlds.com/files/beta/bam.zip
-# Source1-md5:	dd1937ce711927299a1b09edffa319ca
-Source2:	teewars.png
-Source3:	teewars.desktop
-#Source4:	%{name}_srv.desktop
+# Source0-md5:	4d6e5d0fb1b5f0bdf6c5c49714045ef1
+Source1:	%{name}.png
+Source2:	%{name}.desktop
+#Source3:	%{name}_srv.desktop
 URL:		http://www.teeworlds.com/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
+BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
+BuildRequires:	bam >= 0.4.0
 BuildRequires:	python
-BuildRequires:	unzip
+BuildRequires:	python-modules
+BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libX11-devel
-Obsoletes:	teewars
+BuildRequires:	zlib-devel
+Provides:	teewars = %{version}
+Obsoletes:	teewars <= 0.3.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,30 +35,28 @@ Cute little buggers with guns. CTF, DM network game.
 Takie fajne robaczki z gnatami. Gra sieciowa typu CTF, DM.
 
 %prep
-%setup -q -a1 -n %{name}-%{version}-src
-# Workaround for no possibility to pass location of data files
-%{__sed} -i 's|"data/|"%{_datadir}/%{name}/data/|g' \
-	datasrc/data.ds \
-	src/game/client/{gc_map_image.cpp,gc_hooks.cpp,gc_skin.cpp} \
-	src/game/editor/ed_editor.cpp \
-	src/engine/e_map.c \
-	src/engine/client/ec_client.c \
-	src/engine/server/es_server.c
+%setup -q -n %{name}-%{version}-source
+sed -i '/release_settings.cc.optimize = 1/a\Import("pld_config.bam")' bam.lua
 
 %build
-cd bam
-./make_unix.sh
-cd ..
-bam/src/bam release
+cat <<'EOF' > pld_config.bam
+	release_settings.cc.flags:Add("%{rpmcxxflags}")
+	release_settings.cc.c_compiler = "%{__cc}"
+	release_settings.cc.cxx_compiler = "%{__cxx}"
+	release_settings.link.linker = "%{__cxx}"
+	release_settings.link.inputflags = "%{rpmcxxflags} %{rpmldflags}"
+EOF
+
+bam -v release
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/%{name}/data}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/%{name}}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 install %{name} %{name}_srv $RPM_BUILD_ROOT%{_bindir}
-cp -rf data $RPM_BUILD_ROOT%{_datadir}/%{name}/
+cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT