Author: arvenil Date: Sat Apr 5 21:32:04 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to build12 - switched to scons - BR: scons - BR: boost-devel - rm BR: sed
---- Files affected: SPECS: widelands.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/widelands.spec diff -u SPECS/widelands.spec:1.17 SPECS/widelands.spec:1.18 --- SPECS/widelands.spec:1.17 Fri Sep 14 19:16:20 2007 +++ SPECS/widelands.spec Sat Apr 5 23:31:58 2008 @@ -3,7 +3,7 @@ # TODO: # - translations # -%define _build 11 +%define _build 12 Summary: Game like Settlers II Summary(pl.UTF-8): Remake gry Settlers II Name: widelands @@ -12,7 +12,7 @@ License: GPL Group: X11/Applications/Games Source0: http://dl.sourceforge.net/widelands/%{name}-build-%{_build}-source.tar.bz2 -# Source0-md5: ad41d917f7895b6212009ac584178b55 +# Source0-md5: 1b551106e0f613f63abd7e6bdc9cebf6 Source1: %{name}.desktop URL: http://widelands.sourceforge.net/ BuildRequires: SDL-devel >= 1.2.11 @@ -21,9 +21,10 @@ BuildRequires: SDL_mixer-devel >= 1.2.7 BuildRequires: SDL_net-devel BuildRequires: SDL_ttf-devel >= 2.0.0 +BuildRequires: boost-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel -BuildRequires: sed >= 4.0 +BuildRequires: scons BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -49,32 +50,25 @@ %prep %setup -q -n %{name} -rm -f {campaigns,fonts,maps,music,pics,sound,tribes,txts,worlds}/SConscript -# Fixing path -find -type f "(" -name *.cc -or -name *.h ")" -exec sed -i \ - -e 's|#include "filesystem.h"|#include "filesystem/filesystem.h"|g' \ - -e 's|#include "layered_filesystem.h"|#include "filesystem/layered_filesystem.h"|g' \ - -e 's|#include "zip_exceptions.h"|#include "filesystem/zip_exceptions.h"|g' \ - -e 's|#include "zip_filesystem.h"|#include "filesystem/zip_filesystem.h"|g' \ - "{}" ";" - %build -rm -f widelands -%{__make} \ - CXX="%{__cxx}" \ - CXXFLAGS="%{rpmcflags} -Isrc/ui/ui_basic -Isrc -Isrc/editor -Isrc/editor/ui_menus -Isrc/ui/ui_fs_menus -Isrc/editor/tools `sdl-config --cflags`" \ - IMPLICIT_LIBINTL="YES" +%scons \ + install_prefix=%{_prefix} \ + bindir=%{_bindir} \ + datadir=%{_datadir}/%{name} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/games/%{name},%{_desktopdir},%{_pixmapsdir}} -install widelands $RPM_BUILD_ROOT%{_bindir} -install pics/wl-logo-64.png $RPM_BUILD_ROOT%{_pixmapsdir}/widelands.png -cp -r campaigns fonts maps music pics sound tribes txts worlds $RPM_BUILD_ROOT%{_datadir}/games/%{name} +%scons install \ + install_prefix=$RPM_BUILD_ROOT%{_prefix} \ + bindir=$RPM_BUILD_ROOT%{_bindir} \ + datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} + +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} -cp %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install pics/wl-ico-128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png +cp %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -82,10 +76,10 @@ %files %defattr(644,root,root,755) %doc ChangeLog -%attr(755,root,root) %{_bindir}/widelands -%{_datadir}/games/widelands -%{_desktopdir}/widelands.desktop -%{_pixmapsdir}/widelands.png +%attr(755,root,root) %{_bindir}/%{name} +%{_datadir}/%{name} +%{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -93,6 +87,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2008-04-05 21:31:58 arvenil +- up to build12 +- switched to scons +- BR: scons +- BR: boost-devel +- rm BR: sed + Revision 1.17 2007-09-14 17:16:20 arvenil - revert last commit (I've commited wrong spec:/) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/widelands.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
