summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <jwrdegoede@fedoraproject.org>2007-11-26 08:44:36 +0000
committerHans de Goede <jwrdegoede@fedoraproject.org>2007-11-26 08:44:36 +0000
commit9892d0957908a5584b5412171dada54ae4f7c350 (patch)
treec0d8f4b97613bde050305a82d2e2f27ff2c414c0
parent4ad1de21c274a5ebfe6e1ef2e5848ac90f23ec98 (diff)
downloadlua-9892d0957908a5584b5412171dada54ae4f7c350.tar.gz
lua-9892d0957908a5584b5412171dada54ae4f7c350.tar.xz
lua-9892d0957908a5584b5412171dada54ae4f7c350.zip
* Mon Nov 26 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-4lua-5_1_2-4_fc9
- Fix libdir in lua.pc being /usr/lib on x86_64 (bz 399101)
-rw-r--r--lua-5.1.2-multilib.patch18
-rw-r--r--lua.spec5
2 files changed, 22 insertions, 1 deletions
diff --git a/lua-5.1.2-multilib.patch b/lua-5.1.2-multilib.patch
index d39f002..77092d2 100644
--- a/lua-5.1.2-multilib.patch
+++ b/lua-5.1.2-multilib.patch
@@ -15,3 +15,21 @@ diff -up lua-5.1.2/src/luaconf.h.template.in~ lua-5.1.2/src/luaconf.h.template.i
/** autotools-patch **/
#define LUA_PATH_DEFAULT \
+diff -up lua-5.1.2/etc/lua.pc.in~ lua-5.1.2/etc/lua.pc.in
+--- lua-5.1.2/etc/lua.pc.in~ 2007-11-26 09:35:47.000000000 +0100
++++ lua-5.1.2/etc/lua.pc.in 2007-11-26 09:35:47.000000000 +0100
+@@ -2,12 +2,12 @@ V= 5.1
+ R= 5.1.2
+ prefix= @prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir= @libdir@
+ includedir=${prefix}/include
+
+ Name: Lua
+ Description: An Extensible Extension Language
+ Version: ${R}
+ Requires:
+-Libs: -L${libdir} -llua @LUA_LIBS@
++Libs: -llua @LUA_LIBS@
+ Cflags: -I${includedir}
diff --git a/lua.spec b/lua.spec
index c5d9e2b..421fa13 100644
--- a/lua.spec
+++ b/lua.spec
@@ -1,6 +1,6 @@
Name: lua
Version: 5.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Powerful light-weight programming language
Group: Development/Languages
License: MIT
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Nov 26 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-4
+- Fix libdir in lua.pc being /usr/lib on x86_64 (bz 399101)
+
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.2-3
- Also use lib64 instead of lib on ia64 and sparc64