From 48449069a4f31baa97f638c9e7b19cb6bb498d83 Mon Sep 17 00:00:00 2001 From: sparky Date: Tue, 17 Nov 2009 19:57:30 +0000 Subject: [PATCH] - pass %__cxx and %rpmcxxflags, but disable optimization (add -O0) becouse the code is broken - %_build is an internal macro, use %buildver instead - prevent build script from stripping binary (useful debuginfo) - moved data to /usr/share/games/windelands - translations placed inside data directory and packaged Changed files: widelands.spec -> 1.23 --- widelands.spec | 74 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/widelands.spec b/widelands.spec index fc3fa19..aa89dc1 100644 --- a/widelands.spec +++ b/widelands.spec @@ -1,21 +1,19 @@ # # TODO: -# - translations # - create bcond for ggz -# - could not find file or directory: pics/splash.jpg # -%define _build 14 +%define buildver 14 Summary: Game like Settlers II Summary(pl.UTF-8): Remake gry Settlers II Name: widelands -Version: 0.build%{_build} -Release: 0.1 +Version: 0.build%{buildver} +Release: 0.6 License: GPL v2+ Group: X11/Applications/Games -Source0: http://dl.sourceforge.net/widelands/Widelands-Build%{_build}-src.7z +Source0: http://dl.sourceforge.net/widelands/Widelands-Build%{buildver}-src.7z # Source0-md5: 06d63783b82b68af7af26198bc0a5afa Source1: %{name}.desktop -Patch0: %{name}-syntax.patch +#Patch0: %{name}-syntax.patch URL: http://widelands.sourceforge.net/ BuildRequires: SDL-devel >= 1.2.11 BuildRequires: SDL_gfx-devel @@ -23,12 +21,13 @@ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel >= 1.2.7 BuildRequires: SDL_net-devel BuildRequires: SDL_ttf-devel >= 2.0.0 -BuildRequires: boost-devel +BuildRequires: boost-devel >= 1.35 BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: p7zip BuildRequires: scons BuildRequires: sed >= 4.0 +Requires: SDL_image >= 1.2.10 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,24 +54,34 @@ nastawione i rozpocząć z Tobą handel. Jednak, jeśli chcesz rządzić %prep %setup -q -c -T -n %{name} 7z x -o.. %{SOURCE0} -%patch0 -p1 -%{__sed} -i 's/framework-mt/framework/' SConstruct +#%%patch0 -p1 +#%{__sed} -i 's/framework-mt/framework/' SConstruct + +%{__sed} -i '/env.strip=1/d' build/scons-tools/scons_configure.py %build -%scons -j 1 \ +%scons \ + cxx="%{__cxx}" \ + cc="%{__cc}" \ + extra_compile_flags="%{rpmcxxflags} -O0" \ + extra_link_flags="%{rpmcxxflags} %{rpmldflags}" \ build="release" \ - install_prefix="%{_prefix}" \ + pretty_compile_output="false" \ + install_prefix="" \ bindir="%{_bindir}" \ - datadir="%{_datadir}/%{name}" \ + datadir="%{_datadir}/games/%{name}" \ + localedir="%{_datadir}/games/%{name}/locale" \ enable_ggz="false" %install rm -rf $RPM_BUILD_ROOT -%scons install \ - install_prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} +%{__scons} install \ + build="release" \ + install_prefix="$RPM_BUILD_ROOT%{_prefix}" \ + bindir="$RPM_BUILD_ROOT%{_bindir}" \ + datadir="$RPM_BUILD_ROOT%{_datadir}/games/%{name}" \ + localedir="$RPM_BUILD_ROOT%{_datadir}/games/%{name}/locale" \ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} @@ -84,8 +93,35 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog +%doc ChangeLog CREDITS %attr(755,root,root) %{_bindir}/%{name} -%{_datadir}/%{name} +%dir %{_datadir}/games/%{name} +%{_datadir}/games/%{name}/VERSION +%{_datadir}/games/%{name}/campaigns +%{_datadir}/games/%{name}/fonts +%{_datadir}/games/%{name}/global +%{_datadir}/games/%{name}/maps +%{_datadir}/games/%{name}/music +%{_datadir}/games/%{name}/pics +%{_datadir}/games/%{name}/sound +%{_datadir}/games/%{name}/tribes +%{_datadir}/games/%{name}/txts +%{_datadir}/games/%{name}/worlds +%dir %{_datadir}/games/%{name}/locale +%lang(cs) %{_datadir}/games/%{name}/locale/cs_CZ +%lang(da) %{_datadir}/games/%{name}/locale/da_DK +%lang(de) %{_datadir}/games/%{name}/locale/de_DE +%lang(es) %{_datadir}/games/%{name}/locale/es_ES +%lang(fi) %{_datadir}/games/%{name}/locale/fi_FI +%lang(fr) %{_datadir}/games/%{name}/locale/fr_FR +%lang(gl) %{_datadir}/games/%{name}/locale/gl_ES +%lang(he) %{_datadir}/games/%{name}/locale/he_HE +%lang(hu) %{_datadir}/games/%{name}/locale/hu_HU +%lang(it) %{_datadir}/games/%{name}/locale/it_IT +%lang(nl) %{_datadir}/games/%{name}/locale/nl_NL +%lang(pl) %{_datadir}/games/%{name}/locale/pl_PL +%lang(ru) %{_datadir}/games/%{name}/locale/ru_RU +%lang(sk) %{_datadir}/games/%{name}/locale/sk_SK +%lang(sv) %{_datadir}/games/%{name}/locale/sv_SE %{_desktopdir}/%{name}.desktop %{_pixmapsdir}/%{name}.png -- 2.44.0