From 3167eaa99c4cf62668b454399ca2a4215fdd655b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 16 Dec 2014 14:26:18 +0100 Subject: [PATCH] build with lua-5.2 for new tolua++ --- conky.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conky.spec b/conky.spec index 9599510..e382e1d 100644 --- a/conky.spec +++ b/conky.spec @@ -39,9 +39,10 @@ BuildRequires: libXext-devel %{?with_audacious:BuildRequires: audacious-devel < 3.5 dbus-glib-devel} %{?with_curl:BuildRequires: curl-devel} %{?with_imlib:BuildRequires: imlib2-devel} -%{?with_lua:BuildRequires: compat-lua-devel} -%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel} -%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel} +%{?with_lua:BuildRequires: lua-devel} +# tolua++ switched to lua-5.2 in 1.0.93-14 +%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel > 1.0.93-14} +%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel > 1.0.93-14} %{?with_ncurses:BuildRequires: ncurses-devel} %{?with_nvidia:BuildRequires: libXNVCtrl-devel} %{?with_rss:BuildRequires: curl-devel libxml2-devel} @@ -57,6 +58,8 @@ It just keeps on given'er. Yeah. %prep %setup -q -n %{name} +# build with lua-5.2 +sed -i 's|lua == 5.1|lua >= 5.2|' configure.ac.in for i in AUTHORS; do iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}