Hello community, here is the log from the commit of package lua-toluapp for openSUSE:Factory checked in at 2017-09-07 22:14:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-toluapp (Old) and /work/SRC/openSUSE:Factory/.lua-toluapp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-toluapp" Thu Sep 7 22:14:34 2017 rev:2 rq:521095 version:1.0.93 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-toluapp/lua-toluapp.changes 2017-08-24 18:39:02.378305722 +0200 +++ /work/SRC/openSUSE:Factory/.lua-toluapp.new/lua-toluapp.changes 2017-09-07 22:14:34.683443034 +0200 @@ -1,0 +2,5 @@ +Tue Sep 5 10:56:14 UTC 2017 - tchva...@suse.com + +- Tweak the tolua++-1.0.93-lua52.patch to work with lua5.1 too correctly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-toluapp.spec ++++++ --- /var/tmp/diff_new_pack.ILZLzA/_old 2017-09-07 22:14:35.279359055 +0200 +++ /var/tmp/diff_new_pack.ILZLzA/_new 2017-09-07 22:14:35.279359055 +0200 @@ -112,7 +112,7 @@ libdir="%{_libdir}" \ shared=1 \ lib bin \ - -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC" + -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC -DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\"" %install CCFLAGS="%{optflags} -fPIC -I%{lua_incdir}" \ @@ -122,7 +122,7 @@ libdir="%{buildroot}%{_libdir}" \ shared=1 \ install \ - -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC" + -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC -DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\"" # pkgconfig file mkdir -p %{buildroot}%{_libdir}/pkgconfig @@ -141,6 +141,9 @@ Cflags: -I%{_includedir} EOF +mkdir -p %{buildroot}%{lua_noarchdir}/%{name} +install -p -m 644 src/bin/lua/*.lua %{buildroot}%{lua_noarchdir}/%{name} + # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ touch %{buildroot}%{_sysconfdir}/alternatives/tolua++ @@ -163,6 +166,7 @@ %ghost %{_sysconfdir}/alternatives/tolua++ %{_bindir}/tolua++ %{_bindir}/toluapp-%{lua_version} +%{lua_noarchdir}/%{name} %files -n libtolua++-%{lua_suffix}-devel %{_includedir}/tolua++.h ++++++ tolua++-1.0.93-lua52.patch ++++++ --- /var/tmp/diff_new_pack.ILZLzA/_old 2017-09-07 22:14:35.323352855 +0200 +++ /var/tmp/diff_new_pack.ILZLzA/_new 2017-09-07 22:14:35.323352855 +0200 @@ -432,8 +432,8 @@ - lua_pushstring(L,path); lua_setglobal(L,"path"); - strcat(path,"all.lua"); - lua_dofile(L,path); -+ lua_pushstring(L, "/usr/share/toluapp/luapp/"); lua_setglobal(L,"path"); -+ if (luaL_loadfile(L, "/usr/share/toluapp/luapp/all.lua") != 0) { ++ lua_pushstring(L, DATAPATH"/"); lua_setglobal(L,"path"); ++ if (luaL_loadfile(L, DATAPATH"/all.lua") != 0) { + fprintf(stderr, "luaL_loadfile failed\n"); + return 1; + }