commit 3f109a1882cd7072d547508f9619489b5b38e87d
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat May 17 22:15:49 2014 +0200
Update to latest upstream release
.gitignore | 1 +
0ad-rpath.patch | 9 ++++-----
0ad.spec | 14 +++++++++-----
sources | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0975af8..4ac802e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/0ad-0.0.14-alpha-unix-build.tar.xz
/0ad-0.0.15-alpha-unix-build.tar.xz
+/0ad-0.0.16-alpha-unix-build.tar.xz
diff --git a/0ad-rpath.patch b/0ad-rpath.patch
index 84b5569..aeaf823 100644
--- a/0ad-rpath.patch
+++ b/0ad-rpath.patch
@@ -1,7 +1,6 @@
-diff -up 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 0ad-0.0.15-alpha/build/premake/premake4.lua
---- 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 2013-12-27 17:26:42.924652871 -0200
-+++ 0ad-0.0.15-alpha/build/premake/premake4.lua 2013-12-27 17:26:54.611653319 -0200
-@@ -355,26 +355,6 @@ function project_set_build_flags()
+--- 0ad-0.0.16-alpha/build/premake/premake4.lua.orig 2014-05-17 22:21:52.787713008 +0200
++++ 0ad-0.0.16-alpha/build/premake/premake4.lua 2014-05-17 22:22:39.659845979 +0200
+@@ -356,26 +356,6 @@
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
@@ -20,7 +19,7 @@ diff -up 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 0ad-0.0.15-alpha/build
- if _ACTION == "gmake" then
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- elseif _ACTION == "codeblocks" then
-- linkoptions { "-Wl,-R\\\\$$ORIGIN" }
+- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
- end
- end
- end
diff --git a/0ad.spec b/0ad.spec
index 111d793..5be65e3 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -24,8 +24,8 @@
%endif
Name: 0ad
-Version: 0.0.15
-Release: 5%{?dist}
+Version: 0.0.16
+Release: 1%{?dist}
# BSD License:
# build/premake/*
# libraries/valgrind/* (not built/used)
@@ -80,15 +80,16 @@ BuildRequires: enet-devel
%endif
BuildRequires: gamin-devel
BuildRequires: gloox-devel
-BuildRequires: js-devel
BuildRequires: libcurl-devel
BuildRequires: libdnet-devel
+BuildRequires: libicu-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: libzip-devel
BuildRequires: miniupnpc-devel
+BuildRequires: mozjs24-devel
BuildRequires: nasm
%if %{with_system_nvtt}
BuildRequires: nvidia-texture-tools-devel
@@ -155,7 +156,7 @@ build/workspaces/update-workspaces.sh \
%if %{with_system_enet}
--with-system-enet \
%endif
- --with-system-mozjs185 \
+ --with-system-mozjs24 \
--with-system-miniupnpc \
%if %{with_system_nvtt}
--with-system-nvtt \
@@ -171,7 +172,7 @@ make %{?_smp_mflags} -C build/workspaces/gcc config=%{config} verbose=1
# Depends on availablity of nvtt
%if !%{without_nvtt}
%check
-LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir binaries/system
+LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg}
%endif
#-----------------------------------------------------------------------
@@ -238,6 +239,9 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6*
%changelog
+* Sat May 17 2014 Kalev Lember <kalevlember at gmail.com> - 0.0.16-1
+- Update to latest upstream release
+
* Mon May 5 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 0.0.15-5
- Rebuild for newer enet
diff --git a/sources b/sources
index 6c16cb8..105f547 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a651d81eb9b31da01e376ddaa597e954 0ad-0.0.15-alpha-unix-build.tar.xz
+3836bbcdf4edc57c2354b4fef6023146 0ad-0.0.16-alpha-unix-build.tar.xz