diff options
| -rw-r--r-- | lua-5.1.2-multilib.patch | 16 | ||||
| -rw-r--r-- | lua.spec | 7 |
2 files changed, 22 insertions, 1 deletions
diff --git a/lua-5.1.2-multilib.patch b/lua-5.1.2-multilib.patch new file mode 100644 index 0000000..cb9d278 --- /dev/null +++ b/lua-5.1.2-multilib.patch @@ -0,0 +1,16 @@ +diff -up lua-5.1.2/src/luaconf.h.template.in~ lua-5.1.2/src/luaconf.h.template.in +--- lua-5.1.2/src/luaconf.h.template.in~ 2007-10-21 19:33:30.000000000 +0200 ++++ lua-5.1.2/src/luaconf.h.template.in 2007-10-21 19:33:30.000000000 +0200 +@@ -98,7 +98,11 @@ + + /** autotools-patch **/ + #define LUA_LDIR "%lua_datadir%/lua/5.1/" +-#define LUA_CDIR "%lua_libdir%/lua/5.1/" ++#if defined __alpha__ || defined __powerpc64__ || defined __s390x__ || defined __x86_64__ ++#define LUA_CDIR "/usr/lib64/lua/5.1/" ++#else ++#define LUA_CDIR "/usr/lib/lua/5.1/" ++#endif + /** autotools-patch **/ + + #define LUA_PATH_DEFAULT \ @@ -1,12 +1,13 @@ Name: lua Version: 5.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz Patch0: lua-5.1.1-autotoolize.patch.gz +Patch1: lua-5.1.2-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel ncurses-devel @@ -34,6 +35,7 @@ This package contains development files for %{name}. %prep %setup -q %patch0 -p1 -E -z .autoxxx +%patch1 -p1 -z .multilib # fix perms on auto files chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing @@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-2 +- Fix multilib condlict in luaconf.h (bz 342561) + * Mon Apr 2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-1 - New upstream release 5.1.2 - Fix use of rpath on x86_64 |