diff --git a/lua-5.1.5.tar.bz2 b/lua-5.1.5.tar.bz2 deleted file mode 100644 index 09bf451..0000000 --- a/lua-5.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a001f0d997c0330c2ba9c06c4a400f681985a89b14e99d624692b6b17a5c64c0 -size 176289 diff --git a/lua-5.1.5.tar.gz b/lua-5.1.5.tar.gz new file mode 100644 index 0000000..12875d7 --- /dev/null +++ b/lua-5.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 +size 221213 diff --git a/lua51.changes b/lua51.changes index 1413f1a..b958752 100644 --- a/lua51.changes +++ b/lua51.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu May 16 07:19:10 UTC 2013 - pgajdos@suse.com + +- move rpm macros back, but install it in /etc/rpm/macros.lua51 + and call lua5.1 in %lua_version definition + +------------------------------------------------------------------- +Sun May 5 21:47:35 UTC 2013 - mrdocs@opensuse.org + +- move the lua rpm macros to the devel package to avoid conflict + with lua 5.2 + +------------------------------------------------------------------- +Tue Apr 16 11:39:11 UTC 2013 - mmeister@suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + ------------------------------------------------------------------- Mon Jun 18 12:59:24 UTC 2012 - pgajdos@suse.com diff --git a/lua51.spec b/lua51.spec index f951f5a..c542f3b 100644 --- a/lua51.spec +++ b/lua51.spec @@ -1,7 +1,7 @@ # # spec file for package lua51 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Summary: Small Embeddable Language with Simple Procedural Syntax License: MIT Group: System/Libraries Url: http://www.lua.org -Source: lua-%{version}.tar.bz2 +Source: http://www.lua.org/ftp/lua-%{version}.tar.gz Source1: macros.lua Source2: baselibs.conf Patch0: %{name}-%{version}-shared.diff @@ -122,7 +122,7 @@ for file in lua luac ; do done install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version} -install -D %{SOURCE1} %buildroot/etc/rpm/macros.lua +install -D %{SOURCE1} %buildroot/etc/rpm/macros.lua51 %clean rm -rf $RPM_BUILD_ROOT @@ -154,7 +154,7 @@ fi %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua %dir %{_datadir}/lua/%{major_version} -/etc/rpm/macros.lua +/etc/rpm/macros.lua51 %files -n liblua5_1 %defattr(-,root,root) diff --git a/macros.lua b/macros.lua index 612a78f..225f8a9 100644 --- a/macros.lua +++ b/macros.lua @@ -1,7 +1,7 @@ # RPM macros for Lua # The major.minor version of Lua -%lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2) +%lua_version %(lua5.1 -e 'print(_VERSION)' | cut -d ' ' -f 2) # compiled modules should go here %lua_archdir %{_libdir}/lua/%{lua_version}