* 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

1 files changed, 21 insertions, 10 deletions

diff --git a/lua.spec b/lua.spec
index 241ac16..9dd94a8 100644
--- a/lua.spec
+++ b/lua.spec
@@ -1,6 +1,6 @@
 Name:           lua
-Version:        5.1.1
-Release:        2%{?dist}
+Version:        5.1.2
+Release:        1%{?dist}
 Summary:        Powerful light-weight programming language
 Group:          Development/Languages
 License:        MIT
@@ -21,28 +21,32 @@ memory management with garbage collection, making it ideal for
 configuration, scripting, and rapid prototyping.
 
 
-%package	devel
-Summary:	Development files for %{name}
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	ncurses-devel, pkgconfig
+%package devel
+Summary:        Development files for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
-%description	devel
+%description devel
 This package contains development files for %{name}.
 
 
 %prep
 %setup -q
-%patch0 -p1 -E
+%patch0 -p1 -E -z .autoxxx
 # fix perms on auto files
 chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
 
 
 %build
 %configure --with-readline
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 # hack so that only /usr/bin/lua gets linked with readline as it is the
 # only one which needs this and otherwise we get License troubles
 make %{?_smp_mflags} LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"
+# also remove readline from lua.pc
+sed -i 's/-lreadline -lncurses //g' etc/lua.pc
 
 
 %install
@@ -57,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT HISTORY README doc/*.html doc/*.gif
+%doc COPYRIGHT HISTORY README doc/*.html doc/*.css doc/*.gif doc/*.png
 %{_bindir}/lua*
 %{_libdir}/liblua-*.so
 %{_mandir}/man1/lua*.1*
@@ -71,6 +75,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+
+* Fri Jan 19 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.1-3
+- Remove "-lreadline -lncurses" from lua.pc (bz 213895)
+
 * Sun Oct 15 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.1-2
 - Only link /usr/bin/lua with readline / do not link %%{_libdir}/liblua-5.1.so
   with readline so that we don't cause any License troubles for packages