Fix packaging to have separate versions for Lua 5.1 & 5.2 (5.3 doesn't need this)

1 files changed, 5 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1eb99cb59be9..c3b9fbc367b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Stephen Smith <stephen304@gmail.com>
 
 _rockname=bit32
-pkgname=("lua-$_rockname" "lua51-$_rockname" "lua52-$_rockname")
+pkgname=("lua51-$_rockname" "lua52-$_rockname")
 pkgbase=lua-$_rockname
 pkgver=5.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Lua 5.2 bit manipulation library"
 arch=('i686' 'x86_64')
 url="http://www.lua.org/manual/5.2/manual.html#6.7"
@@ -19,26 +19,16 @@ _package_helper() {
 
   mkdir -p "$_lua_ver"
   cd "lua-compat-5.2-bitlib-$pkgver"
-  luarocks make --pack-binary-rock --deps-mode=none "rockspecs/$_rockname-$pkgver-1.rockspec"
-  mv *.rock ../${_lua_ver}/
-  luarocks install --tree="$pkgdir/usr/" --deps-mode=none ../${_lua_ver}/*.rock
+  luarocks --lua-version=${_lua_ver} make --pack-binary-rock --deps-mode=none "rockspecs/$_rockname-$pkgver-1.rockspec"
+  cp *.rock ../${_lua_ver}/
+  luarocks --lua-version=${_lua_ver} install --tree="$pkgdir/usr/" --deps-mode=none ../${_lua_ver}/*.rock
   find "$pkgdir/usr" -name manifest -delete
 }
 
 package_lua51-bit32() {
-  depends+=('lua51')
-
   _package_helper "5.1"
 }
 
 package_lua52-bit32() {
-  depends+=('lua52')
-
   _package_helper "5.2"
 }
-
-package_lua-bit32() {
-  depends+=('lua')
-
-  _package_helper "5.3"
-}