up to 20221222 snap

diff --git a/config.patch b/config.patch
index 0ebbf2074ecc28018b062525db1ae7df61d9efd8..92a0cd78f67039fca2a2ab8c9098ee31840685f8 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -2,8 +2,8 @@ diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
 --- LuaJIT.orig/Makefile       2022-05-01 14:24:18.622666652 +0200
 +++ LuaJIT/Makefile    2022-05-01 14:40:11.423331452 +0200
 @@ -35,7 +35,7 @@
- INSTALL_SHARE= $(DPREFIX)/share
- INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+ INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+ INSTALL_INC=   $(INSTALL_DEFINC)
  
 -INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
 +INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit/$(MAJVER).$(MINVER)
@@ -17,9 +17,9 @@ diff -ur LuaJIT.orig/Makefile LuaJIT/Makefile
 -            -e "s|^multilib=.*|multilib=$(MULTILIB)|"
 +            -e "s|^multilib=.*|multilib=$(MULTILIB)|" \
 +            -e "s|^version=.*|version=$(VERSION)|"
- 
- FILE_T= luajit
- FILE_A= libluajit.a
+ ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
+   SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
+ endif
 diff -ur LuaJIT.orig/src/luaconf.h LuaJIT/src/luaconf.h
 --- LuaJIT.orig/src/luaconf.h  2022-04-29 09:13:18.000000000 +0200
 +++ LuaJIT/src/luaconf.h       2022-05-01 14:36:10.660525525 +0200

diff --git a/luajit.spec b/luajit.spec
index 2f664642ab616a006c23a9b7c62ffa503139ddd1..5008d99e02852ef2e8f9cbe15e19e96a969264e9 100644 (file)
--- a/luajit.spec
+++ b/luajit.spec
@@ -1,7 +1,7 @@
 # TODO
 # - x32 not supported by upstream: http://www.freelists.org/post/luajit/Building-luajit202-on-x32,1
 
-%define                snap            20220429
+%define                snap            20221222
 Summary:       Just-in-Time compiler for Lua
 Summary(pl.UTF-8):     Kompilator JIT dla języka Lua
 Name:          luajit
@@ -11,7 +11,7 @@ License:      MIT
 Group:         Libraries
 # Source0Download: http://luajit.org/download.html
 Source0:       %{name}-%{version}-%{snap}.tar.xz
-# Source0-md5: 201b01f0b6830a1a2bd70341587e868a
+# Source0-md5: 1b06e2bcacc09537f9d67dc3d636bd84
 Patch0:                config.patch
 URL:           http://luajit.org/
 BuildRequires: sed >= 4.0
@@ -67,7 +67,7 @@ Static LuaJIT library.
 Statyczna biblioteka LuaJIT.
 
 %prep
-%setup -q -n LuaJIT
+%setup -q -n luajit
 %patch0 -p1
 
 # preserve timestamps