Accepting request 175827 from devel:languages:misc

- move rpm macros back, but install it in /etc/rpm/macros.lua51
  and call lua5.1 in %lua_version definition

- move the lua rpm macros to the devel package to avoid conflict 
  with lua 5.2

- Added url as source.
  Please see http://en.opensuse.org/SourceUrls

OBS-URL: https://build.opensuse.org/request/show/175827
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua51?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2013-05-16 14:14:08 +00:00 committed by Git OBS Bridge
parent ba2aea3ff8
commit ad3cafe2f3
5 changed files with 26 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a001f0d997c0330c2ba9c06c4a400f681985a89b14e99d624692b6b17a5c64c0
size 176289

BIN
lua-5.1.5.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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

View File

@ -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)

View File

@ -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}