commit patch too

Fixes 495095 and 629437

.gitignore

@@ -1,2 +1,2 @@
-lua-5.1.1.tar.gz
 lua-5.1.1-autotoolize.patch.gz
+lua-5.1.2.tar.gz

Makefile

@@ -4,7 +4,7 @@ NAME := lua
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON	:= $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-12

lua.spec

@@ -1,14 +1,15 @@
 Name:           lua
-Version:        5.1.1
-Release:        2%{?dist}
+Version:        5.1.4
+Release:        4%{?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
+Patch0:         lua-5.1.4-autotoolize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel ncurses-devel
+Provides:       lua = 5.1
 
 %description
 Lua is a powerful light-weight programming language designed for
@@ -25,30 +26,44 @@ configuration, scripting, and rapid prototyping.
 Summary:        Development files for %{name}
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	ncurses-devel, pkgconfig
+Requires:       pkgconfig
 
 %description devel
 This package contains development files for %{name}.
 
+%package static
+Summary:        Static library for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description static
+This package contains the static version of liblua 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"
+make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl"
+# also remove readline from lua.pc
+sed -i 's/-lreadline -lncurses //g' etc/lua.pc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/5.1
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/5.1
 
 
 %clean
@@ -57,10 +72,15 @@ 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*
+%dir %{_libdir}/lua
+%dir %{_libdir}/lua/5.1
+%dir %{_datadir}/lua
+%dir %{_datadir}/lua/5.1
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,8 +89,61 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblua.so
 %{_libdir}/pkgconfig/*.pc
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 11 2009 Tim Niemueller <tim@niemueller.de> - 5.1.4-2
+- Link liblua.so with -lm (math lib), fixes rhbz #499238
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Sep 03 2008 Tim Niemueller <tim@niemueller.de> - 5.1.4-1
+- New upstream release 5.1.4
+
+* Mon May 12 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-6
+- Add -static subpackage with static liblua, fixes rh bug #445939
+
+* Sun Apr 13 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-5
+- Provide lua = 5.1, this way add-on packages can easily depend on the Lua
+  base version and expect certain paths for packages
+
+* Sat Apr  5 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.3-4
+- Not only own $libdir/lua/5.1 and $datadir/lua/5.1 but also $libdir/lua
+  and $datadir/lua for proper removal of these dirs upon lua removal
+
+* Fri Mar 14 2008 Tim Niemueller <tim@niemueller.de> - 5.1.3-3
+- own $libdir/lua/5.1 and $datadir/lua/5.1. These are the standard package
+  search path for Lua. Packaging them properly allows for easy creation of
+  Lua addon packages.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.1.3-2
+- Autorebuild for GCC 4.3
+
+* Sat Jan 26 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 5.1.3-1
+- New upstream release 5.1.3
+
+* 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 
+
+* 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
+
+* 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

sources

@@ -1,2 +1 @@
-22f4f912f20802c11006fe9b84d5c461  lua-5.1.1.tar.gz
-d4116caee10a37951b413436f9e2a119  lua-5.1.1-autotoolize.patch.gz
+d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz