- up to 0.4.2

- workaround for no possibility to pass location of data files,
  removed not needed anymore script
- binaries moved away from datadir (never ever put binaries in datadir)
- adapter, more TODO, cleanup

Changed files:
    teeworlds.spec -> 1.10

diff --git a/teeworlds.spec b/teeworlds.spec
index 49a44f5415847c08eb501403af41b4ce2d0c1c95..b65f4b58cdd0e93772bae22f1d50995a4e250f10 100644 (file)
--- a/teeworlds.spec
+++ b/teeworlds.spec
@@ -1,25 +1,25 @@
 #
 # TODO:
-# rename to teeworlds.spec on CVS
-Name:          teeworlds
-Summary:       Cute little buggers with guns.
+# - rename to teeworlds.spec on CVS
+# - exclude bam to separate spec file and BR it
+Summary:       Cute little buggers with guns
 Summary(pl.UTF-8):     Takie fajne robaczki z gnatami.
-Version:       0.4.1
+Name:          teeworlds
+Version:       0.4.2
 Release:       1
-Group:         X11/Applications/Games
 License:       distributable
+Group:         X11/Applications/Games
 Source0:       http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
-# Source0-md5: d2977b5f46a83043b6e748999de7d5b8
+# 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
-Source4:       teewars.sh
 URL:           http://www.teeworlds.com/
-BuildRequires: alsa-lib-devel
-BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
+BuildRequires: alsa-lib-devel
 BuildRequires: python
 BuildRequires: unzip
 BuildRequires: xorg-lib-libX11-devel
@@ -27,16 +27,21 @@ Obsoletes:  teewars
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Cute little buggers with guns.
-CTF,DM network game.
+Cute little buggers with guns. CTF, DM network game.
 
 %description -l pl.UTF-8
-Takie fajne robaczki z gnatami. Czyli:
-Gra sieciowa typu CTF,DM.
+Takie fajne robaczki z gnatami. Gra sieciowa typu CTF, DM.
 
 %prep
 %setup -q -a1 -n %{name}-%{version}-src
-#%patch0 -p0
+# 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
 
 %build
 cd bam
@@ -50,8 +55,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}.sh
-install %{name} %{name}_srv $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install %{name} %{name}_srv $RPM_BUILD_ROOT%{_bindir}
 cp -rf data $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %clean
@@ -60,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc readme.txt license.txt
-%attr(755,root,root) %{_bindir}/%{name}.sh
-%attr(755,root,root) %{_datadir}/%{name}/%{name}*
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}_srv
 %{_datadir}/%{name}
-%{_pixmapsdir}/*.png
-%{_desktopdir}/*.desktop
+%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/%{name}.desktop