- up to 0.8.7656

- BR: smpeg-devel
- BR: libvorbis-devel
- rm BR: OpenAL-devel
- rm BR: libsigc++-devel

Changed files:
    btanks.spec -> 1.7

diff --git a/btanks.spec b/btanks.spec
index 686da3469f3c97f06e8ceb852e71dcbeec81656e..9b631c1f9f92dbf61bece305b90be64c1800a8e3 100644 (file)
--- a/btanks.spec
+++ b/btanks.spec
@@ -1,23 +1,23 @@
 Summary:       Fast 2D tank arcade game with multiplayer and split-screen modes
 Summary(pl.UTF-8):     Szybka gra zręcznościowa z czołgami, trybem dla wielu graczy i podzielonym ekranem
 Name:          btanks
 Summary:       Fast 2D tank arcade game with multiplayer and split-screen modes
 Summary(pl.UTF-8):     Szybka gra zręcznościowa z czołgami, trybem dla wielu graczy i podzielonym ekranem
 Name:          btanks

-Version:       0.7.5800
+Version:       0.8.7656

 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Games
 Source0:       http://dl.sourceforge.net/btanks/%{name}-%{version}.tar.bz2
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Games
 Source0:       http://dl.sourceforge.net/btanks/%{name}-%{version}.tar.bz2

-# Source0-md5: 538eadf2b78897620f3ef683a4ea423a
+# Source0-md5: d815db9784ad6498c3c5d002e64106b3

 Source1:       %{name}.desktop
 URL:           http://btanks.sourceforge.net/blog/langswitch_lang/en
 Source1:       %{name}.desktop
 URL:           http://btanks.sourceforge.net/blog/langswitch_lang/en

-BuildRequires: OpenAL-devel >= 0.0.8

 BuildRequires: OpenGL-GLU-devel
 BuildRequires: SDL_image-devel
 BuildRequires: expat-devel
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: SDL_image-devel
 BuildRequires: expat-devel

-BuildRequires: libsigc++-devel
+BuildRequires: libvorbis-devel

 BuildRequires: lua51-devel
 BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
 BuildRequires: scons
 BuildRequires: lua51-devel
 BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
 BuildRequires: scons

+BuildRequires: smpeg-devel

 BuildRequires: zlib-devel
 Requires:      %{name}-data = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: zlib-devel
 Requires:      %{name}-data = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -41,12 +41,13 @@ wszystkim oraz współpracę - cóż więcej potrzeba do zabawy z kolegami?
 %prep
 %setup -q
 # Proper name for our lua
 %prep
 %setup -q
 # Proper name for our lua

-sed -e 's/lua5.1/lua51/g' -i SConscript
-sed -e 's/-O3 //g' -i SConstruct
+sed -e 's/lua5.1/lua51/g' -i engine/SConscript
+sed -e 's/-O3 //g' -i engine/SConscript

 
 %build
 %scons \
 
 %build
 %scons \

-       resources_dir=%{_libdir}/%{name} \
+       resources_dir=%{_datadir}/%{name} \
+       plugins_dir=%{_libdir}/%{name} \

        lib_dir=%{_libdir}
 
 %install
        lib_dir=%{_libdir}
 
 %install


@@ -55,11 +56,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}

-install bt $RPM_BUILD_ROOT%{_bindir}/%{name}
-install libbt.so libmrt.so libsdlx.so $RPM_BUILD_ROOT%{_libdir}
-install libbt_objects.so $RPM_BUILD_ROOT%{_libdir}/%{name}
-ln -sf %{_datadir}/%{name}/data $RPM_BUILD_ROOT%{_libdir}/%{name}/data
-install src/bt.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
+install build/release/engine/btanks $RPM_BUILD_ROOT%{_bindir}/%{name}
+install build/release/editor/bted $RPM_BUILD_ROOT%{_bindir}/bted
+install build/release/engine/libbt.so $RPM_BUILD_ROOT%{_libdir}
+install build/release/mrt/libmrt.so $RPM_BUILD_ROOT%{_libdir}
+install build/release/sdlx/libsdlx.so $RPM_BUILD_ROOT%{_libdir}
+install build/release/clunk/libclunk.so $RPM_BUILD_ROOT%{_libdir}
+install build/release/objects/libbt_objects.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+install engine/src/bt.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -68,11 +72,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README-*.txt
 %attr(755,root,root) %{_bindir}/%{name}
 %defattr(644,root,root,755)
 %doc ChangeLog README-*.txt
 %attr(755,root,root) %{_bindir}/%{name}

+%attr(755,root,root) %{_bindir}/bted

 %attr(755,root,root) %{_libdir}/libbt.so
 %attr(755,root,root) %{_libdir}/libmrt.so
 %attr(755,root,root) %{_libdir}/libsdlx.so
 %attr(755,root,root) %{_libdir}/libbt.so
 %attr(755,root,root) %{_libdir}/libmrt.so
 %attr(755,root,root) %{_libdir}/libsdlx.so

+%attr(755,root,root) %{_libdir}/libclunk.so

 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libbt_objects.so
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libbt_objects.so

-%{_libdir}/%{name}/data

 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.xpm
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.xpm