[hedgewars] Use the lua compat library
Bruno Wolff III
bruno at fedoraproject.org
Sat Jan 3 22:37:28 UTC 2015
commit 5c2a21602a4a62ce2ff2e74813ef01ab6f792f6d
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jan 3 14:05:40 2015 -0600
Use the lua compat library
The patch to use lua-5.2 was pretty messy and it seems better to
use the compat library for lua-5.1 until upstream switches to 5.2.
hedgewars-0.9.18-lua-5.2.patch | 2736 ----------------------------------------
hedgewars.spec | 6 +-
2 files changed, 2 insertions(+), 2740 deletions(-)
---
diff --git a/hedgewars.spec b/hedgewars.spec
index 076f2b3..5de15d5 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -17,13 +17,11 @@ Patch0: hedgewars-compiler-opts.patch
# avoid the same issue. The original patch is available from:
# https://launchpadlibrarian.net/85736468/hedgewars_0.9.17-1~maverick0.1.debdiff
Patch1: hedgewars-no-bytestring.patch
-# Lua 5.2
-Patch2: hedgewars-0.9.18-lua-5.2.patch
# ghc does not support -dynamic on arm
#Patch4: hedgewars-0.9.18-no-dyn-haskell.patch
BuildRequires: fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires: SDL_ttf-devel openssl-devel cmake desktop-file-utils
-BuildRequires: libpng-devel lua-devel
+BuildRequires: libpng-devel
Requires: dejavu-sans-fonts wqy-zenhei-fonts hicolor-icon-theme
# https://bugzilla.redhat.com/show_bug.cgi?id=520400
# no fpc on s390(x)
@@ -53,6 +51,7 @@ BuildRequires: ghc-haskell2010-devel
BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-vector-devel
BuildRequires: ghc-SHA-devel
+BuildRequires: compat-lua-devel
%description -n hedgewars-server
A standalone server that can be used for LAN play or a private internet server.
@@ -61,7 +60,6 @@ A standalone server that can be used for LAN play or a private internet server.
%setup -q -n %{name}-src-%{version}
#%patch0 -p1
%patch1 -p0
-#%patch2 -p1 -b .lua-52
%ifarch %{arm}
# ghc does not support -dynamic on arm
#%patch4 -p1
More information about the scm-commits
mailing list