[techne] Added a patch that makes configure.ac find compat-lua 5.1.
Tadej Janež
tadej at fedoraproject.org
Thu Aug 8 16:01:55 UTC 2013
commit ca8aba8775a76a95d3ca16cdeed5e21931ae1e29
Author: Tadej Janež <tadej.janez at tadej.hicsalta.si>
Date: Thu Aug 8 17:59:57 2013 +0200
Added a patch that makes configure.ac find compat-lua 5.1.
techne-0.2.3-compat-lua-5.1.patch | 21 +++++++++++++++++++++
techne.spec | 22 +++++++++++++---------
2 files changed, 34 insertions(+), 9 deletions(-)
---
diff --git a/techne-0.2.3-compat-lua-5.1.patch b/techne-0.2.3-compat-lua-5.1.patch
new file mode 100644
index 0000000..ec33bc4
--- /dev/null
+++ b/techne-0.2.3-compat-lua-5.1.patch
@@ -0,0 +1,21 @@
+diff -up techne-0.2.3/configure.ac.lua-5.1 techne-0.2.3/configure.ac
+--- techne-0.2.3/configure.ac.lua-5.1 2013-08-08 17:32:18.787563550 +0200
++++ techne-0.2.3/configure.ac 2013-08-08 17:33:58.985962260 +0200
+@@ -22,7 +22,7 @@ AM_PROG_CC_C_O
+
+ luaname=$(
+ for p in `pkg-config --silence-errors --list-all |
+- grep "^\(lua\|lua51\|lua-5.1\|lua5.1\)[[[:space:]]]" | cut -d' ' -f1`; do
++ grep "^lua-5.1[[[:space:]]]" | cut -d' ' -f1`; do
+ if pkg-config --exists "$p >= 5.1 $p < 5.2" ; then
+ echo $p
+ break
+@@ -37,7 +37,7 @@ luaname=$(
+ PKG_CHECK_MODULES([LUA], [${luaname}])
+
+ if test -z "${LUAC}"; then
+- AC_CHECK_PROGS(LUAC, [luac5.1 luac51 luac])
++ AC_CHECK_PROGS(LUAC, [luac-5.1])
+
+ if test -z "`${LUAC} -v | grep "Lua 5.1"`"; then
+ AC_MSG_ERROR([
diff --git a/techne.spec b/techne.spec
index 138b221..8fd831e 100644
--- a/techne.spec
+++ b/techne.spec
@@ -7,21 +7,25 @@ Group: System Environment/Libraries
License: GPLv3+
URL: http://www.nongnu.org/techne/
Source0: http://download.savannah.gnu.org/releases/techne/%{name}-%{version}.tar.gz
+# Use compat-lua 5.1 until Techne is ported to Lua 5.2.
+Patch0: techne-0.2.3-compat-lua-5.1.patch
BuildRequires: gcc-objc
BuildRequires: ode-devel
-# Lua was upgraded to v5.2 with Fedora 20, but techne doesn't support it yet
-%if 0%{?fedora} >= 20
-BuildRequires: compat-lua-devel >= 5.1.4-5
-%else
-BuildRequires: lua-devel
-%endif
BuildRequires: ImageMagick-devel
BuildRequires: gtkglext-devel
BuildRequires: openal-soft-devel
BuildRequires: webkitgtk-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: plplot-devel
+%if 0%{?fedora} >= 20
+BuildRequires: compat-lua-devel
+%else
+BuildRequires: lua-devel
+%endif
+# The following are only necessary when calling `autoreconf`
+BuildRequires: autoconf
+BuildRequires: automake
%description
@@ -32,6 +36,8 @@ specified and then proceeds to simulate and render the system onscreen.
%prep
%setup -q
+%patch0 -p1
+autoreconf -i
%build
@@ -61,9 +67,7 @@ rm -f %{buildroot}/%{_docdir}/%{name}/README
%changelog
* Thu Aug 08 2013 Tadej Janež <tadej.janez at tadej.hicsalta.si> 0.2.3-8
-- With Fedora 20, Lua was upgraded to v5.2, but techne doesn't support it yet:
- as a temporary fix, techne now has a BuildRequires on compat-lua-devel
- (fixes FTBFS bug #992784)
+- Build with compat-lua on F20+ (fixes FTBFS bug #992784)
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list