diff --git a/.abf.yml b/.abf.yml index b025bd9..01a190e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - 0ad-0.0.17-alpha-unix-build.tar.xz: a5abc81b450cbb766750ac44a172643389eca3d8 + 0ad-0.0.18-alpha-unix-build.tar.xz: cd233c684d9dcc81d1ae4b42d84f06aedc8398a8 diff --git a/0ad.spec b/0ad.spec index a7625ce..29795d7 100644 --- a/0ad.spec +++ b/0ad.spec @@ -12,11 +12,10 @@ %global with_system_nvtt 0 %global without_nvtt 1 -%global with_system_enet 1 Summary: Cross-Platform RTS Game of Ancient Warfare Name: 0ad -Version: 0.0.17 +Version: 0.0.18 Release: 1 Epoch: 1 License: GPLv2+ and BSD and MIT and IBM @@ -47,7 +46,7 @@ BuildRequires: miniupnpc-devel %if %{with_system_nvtt} BuildRequires: nvidia-texture-tools-devel %endif -BuildRequires: wxgtku-devel +BuildRequires: wxgtku3.0-devel BuildRequires: pkgconfig(gloox) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(IL) @@ -56,7 +55,7 @@ BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzip) -BuildRequires: pkgconfig(mozjs-24) +BuildRequires: pkgconfig(mozjs-31) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(vorbis) @@ -111,10 +110,7 @@ build/workspaces/update-workspaces.sh \ --bindir %{_gamesbindir} \ --datadir %{_gamesdatadir}/%{name} \ --libdir %{_libdir}/%{name} \ -%if %{with_system_enet} - --with-system-enet \ -%endif - --with-system-mozjs24 \ + --with-system-mozjs31 \ --with-system-miniupnpc \ %if %{with_system_nvtt} --with-system-nvtt \ @@ -136,10 +132,6 @@ for name in AtlasUI%{dbg} Collada%{dbg}; do install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so done -%if !%{with_system_enet} - install -p -m 755 binaries/system/libenet.so.1 %{buildroot}%{_libdir}/%{name}/libenet.so.1 -%endif - %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