diff --git a/.abf.yml b/.abf.yml index 288e8a6..f514e0b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - 0ad-0.0.21-alpha-unix-build.tar.xz: efcdc0a15011df39d604aefc7a5d784158a9b884 + 0ad-0.0.22-alpha-unix-build.tar.xz: da30b43f42e7e0cfc962307b4393711a6721dd91 diff --git a/0ad-0.0.21-desktop.patch b/0ad-0.0.21-desktop.patch deleted file mode 100644 index 8dbf548..0000000 --- a/0ad-0.0.21-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN 0ad-0.0.21-alpha/build/resources/0ad.desktop 0ad-0.0.21-alpha-patched/build/resources/0ad.desktop ---- 0ad-0.0.21-alpha/build/resources/0ad.desktop 2016-11-02 04:07:21.000000000 +1000 -+++ 0ad-0.0.21-alpha-patched/build/resources/0ad.desktop 2016-12-05 15:54:01.181109914 +1000 -@@ -6,7 +6,6 @@ - Terminal=false - Type=Application - Categories=Game;StrategyGame; --URL=https://play0ad.com/ - Comment=A real-time strategy game of ancient warfare - Comment[de]=Ein Echtzeitstrategiespiel, das die Kriegsführung der Antike behandelt - Comment[es]=Un juego de estrategia en tiempo real de guerra antigua diff --git a/0ad.spec b/0ad.spec index 754dcb8..7d9c86a 100644 --- a/0ad.spec +++ b/0ad.spec @@ -15,8 +15,8 @@ Summary: Cross-Platform RTS Game of Ancient Warfare Name: 0ad -Version: 0.0.21 -Release: 4 +Version: 0.0.22 +Release: 1 Epoch: 1 License: GPLv2+ and BSD and MIT and IBM Group: Games/Strategy @@ -35,7 +35,6 @@ Patch1: 0ad-0.0.19-debug.patch Patch2: 0ad-mozjs-incompatible.patch # After some trial&error this corrects a %%check failure with gcc 4.9 on i686 Patch3: 0ad-check.patch -Patch4: 0ad-0.0.21-desktop.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -100,7 +99,6 @@ hobbyist game developers, since 2001. %endif %patch2 -p1 %patch3 -p1 -%patch4 -p1 %if %{with_system_nvtt} rm -fr libraries/nvtt @@ -133,12 +131,12 @@ install -m 755 binaries/system/pyrogenesis%{dbg} %{buildroot}%{_gamesbindir}/pyr install -d -m 755 %{buildroot}%{_libdir}/%{name} for name in AtlasUI%{dbg} Collada%{dbg}; do - install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so + install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so done %if !%{without_nvtt} && !%{with_system_nvtt} for name in nvcore nvimage nvmath nvtt; do - install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so + install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so done %endif @@ -148,7 +146,7 @@ install -p -m 644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdat 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 + %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop install -d -m 755 %{buildroot}%{_gamesdatadir}/pixmaps install -m 644 build/resources/0ad.png %{buildroot}%{_gamesdatadir}/pixmaps/%{name}.png