[hedgewars] Fix up using compat-lua-devel
Bruno Wolff III
bruno at fedoraproject.org
Sun Jan 4 20:31:29 UTC 2015
commit 4fa32f4526feedd9cf3872858d5404158e6057c3
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Jan 4 14:31:27 2015 -0600
Fix up using compat-lua-devel
hedgewars-lua-search.patch | 11 +++++++++++
hedgewars.spec | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/hedgewars-lua-search.patch b/hedgewars-lua-search.patch
new file mode 100644
index 0000000..d35a0ab
--- /dev/null
+++ b/hedgewars-lua-search.patch
@@ -0,0 +1,11 @@
+--- cmake_modules/FindLua.cmake.orig 2015-01-04 13:44:47.987751977 -0600
++++ cmake_modules/FindLua.cmake 2015-01-04 13:47:44.523188723 -0600
+@@ -17,7 +17,7 @@
+
+ find_path(LUA_INCLUDE_DIR lua.h
+ PATHS /usr/include /usr/local/include /usr/pkg/include
+- PATH_SUFFIXES lua5.1 lua51)
++ PATH_SUFFIXES lua5.1 lua51 lua-5.1)
+ find_library(LUA_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
+ PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib)
+
diff --git a/hedgewars.spec b/hedgewars.spec
index 67f7a0e..fd3bf1a 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -1,6 +1,6 @@
Name: hedgewars
Version: 0.9.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Funny turn-based artillery game, featuring fighting Hedgehogs!
Group: Amusements/Games
License: GPL+
@@ -19,6 +19,8 @@ Patch1: hedgewars-no-bytestring.patch
# The hedgewars physfs helper library needs to be installed in the correct
# library directory according to arch
Patch5: hedgewars-multilib.patch
+# FindLua.cmake doesn't check for the include dir using lua-5.1
+Patch6: hedgewars-lua-search.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 physfs-devel
@@ -58,7 +60,6 @@ BuildRequires: ghc-entropy-devel
BuildRequires: ghc-zlib-devel
BuildRequires: ghc-random-devel
BuildRequires: compat-lua-devel
-BuildRequires: lua-devel
%description -n hedgewars-server
A standalone server that can be used for LAN play or a private internet server.
@@ -67,6 +68,7 @@ A standalone server that can be used for LAN play or a private internet server.
%setup -q -n %{name}-src-%{version}
%patch1 -p0
%patch5 -p0
+%patch6 -p0
# Make sure that we don't use bundled libraries
rm -r misc/liblua misc/libphysfs
@@ -147,6 +149,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jan 04 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21-2
+- Fix for lua problem
+
* Fri Jan 02 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21-1
- Latest upstream release
More information about the scm-commits
mailing list