diff --git a/.abf.yml b/.abf.yml index 4364c78..56db3cc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "0ad-r10803-alpha-unix-build.tar.xz": 9c9ee04bf1327bfd9161f51b18180ec8d3c6547b + "0ad-r11339-alpha-unix-build.tar.xz": e44f8484ca7082b1a9f2761a48aa8f54c8e833d1 diff --git a/0ad.spec b/0ad.spec index 0a8cf7a..f8bd4cc 100644 --- a/0ad.spec +++ b/0ad.spec @@ -17,8 +17,12 @@ Name: 0ad Epoch: 1 -Version: r10803 +Version: r11339 +%if %mdkversion >= 201100 Release: 0.2 +%else +Release: %mkrel 0.2 +%endif License: GPLv2+ Group: Games/Strategy Summary: Cross-Platform RTS Game of Ancient Warfare @@ -50,7 +54,6 @@ BuildRequires: SDL-devel BuildRequires: subversion #BuildRequires: wxGTK-devel BuildRequires: wxgtku-devel -BuildRequires: X11-devel # FAMMonitorDirectory fails if passing a relative directory # Use FAMNoExists (gamin specific to speed up a little bit initialization @@ -105,6 +108,8 @@ done install -d -m 755 %{buildroot}%{_gamesdatadir}/applications install -m 644 build/resources/0ad.desktop %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop +perl -pi -e 's|%{_bindir}/0ad|%{_gamesbindir}/0ad|;' \ + %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop install -d -m 755 %{buildroot}%{_gamesdatadir}/pixmaps install -m 644 build/resources/0ad.png %{buildroot}%{_gamesdatadir}/pixmaps/%{name}.png @@ -112,6 +117,9 @@ install -m 644 build/resources/0ad.png %{buildroot}%{_gamesdatadir}/pixmaps/%{na install -d -m 755 %{buildroot}%{_gamesdatadir}/%{name} cp -a binaries/data/* %{buildroot}%{_gamesdatadir}/%{name} +mkdir -p %{buildroot}%{_datadir} +mv -f %{buildroot}%{_gamesdatadir}/{pixmaps,applications} %{buildroot}%{_datadir} + cat > %{buildroot}%{_gamesbindir}/0ad <