From a1ccfb4a19999c4149f323cb5ba77c6840c8fb30 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 6 Oct 2010 22:16:24 -0600 Subject: [PATCH] Update to 5.1.4-4 from f12 branch. Fixes 495095 and 629437 --- branch | 2 +- lua.spec | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- sources | 3 +-- 3 files changed, 69 insertions(+), 8 deletions(-) diff --git a/branch b/branch index 42f697a..06de2d2 100644 --- a/branch +++ b/branch @@ -1 +1 @@ -EL-5 +F-12 diff --git a/lua.spec b/lua.spec index 9dd94a8..1755e04 100644 --- a/lua.spec +++ b/lua.spec @@ -1,14 +1,15 @@ Name: lua -Version: 5.1.2 -Release: 1%{?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 @@ -30,6 +31,14 @@ 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 @@ -44,7 +53,7 @@ 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 @@ -52,7 +61,9 @@ 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 @@ -65,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT %{_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,-) @@ -73,8 +89,54 @@ 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 - 5.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Tim Niemueller - 5.1.4-2 +- Link liblua.so with -lm (math lib), fixes rhbz #499238 + +* Wed Feb 25 2009 Fedora Release Engineering - 5.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Sep 03 2008 Tim Niemueller - 5.1.4-1 +- New upstream release 5.1.4 + +* Mon May 12 2008 Tim Niemueller - 5.1.3-6 +- Add -static subpackage with static liblua, fixes rh bug #445939 + +* Sun Apr 13 2008 Tim Niemueller - 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 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 - 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 - 5.1.3-2 +- Autorebuild for GCC 4.3 + +* Sat Jan 26 2008 Hans de Goede 5.1.3-1 +- New upstream release 5.1.3 + +* Mon Nov 26 2007 Hans de Goede 5.1.2-4 +- Fix libdir in lua.pc being /usr/lib on x86_64 (bz 399101) + +* Sun Oct 21 2007 Hans de Goede 5.1.2-3 +- Also use lib64 instead of lib on ia64 and sparc64 + +* Sun Oct 21 2007 Hans de Goede 5.1.2-2 +- Fix multilib condlict in luaconf.h (bz 342561) + * Mon Apr 2 2007 Hans de Goede 5.1.2-1 - New upstream release 5.1.2 - Fix use of rpath on x86_64 diff --git a/sources b/sources index c9da51f..9e11e02 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -751d2dfd522941e82571195aa81abe4c lua-5.1.1-autotoolize.patch.gz -687ce4c2a1ddff18f1008490fdc4e5e0 lua-5.1.2.tar.gz +d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz