Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
323868d153 !8 remove BuildRequires gdb
From: @xinyingchao
Reviewed-by: @overweight
Signed-off-by: @overweight
2021-07-23 06:27:54 +00:00
Zhiqiang Liu
e9751a95d5 remove BuildRequires gdb 2021-07-23 11:55:25 +08:00
openeuler-ci-bot
0f0fd9bb2b !7 update yaml file
From: @tong_1001
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2020-10-29 09:13:14 +08:00
桐小哥
4622061dc0 update lua-expat.yaml. 2020-10-28 16:09:18 +08:00
openeuler-ci-bot
dda33dc518 !6 lua-expat
Merge pull request !6 from syyhao/master
2020-08-14 21:05:40 +08:00
Yangyang Shen
ae03808c04 Modify macro of luaver for bumping version of lua 2020-08-14 20:32:43 +08:00
openeuler-ci-bot
5d603cb9a6 !5 Fix unresolvable because lua roll back version 5.3.5
Merge pull request !5 from 温占礼/master
2020-08-12 16:41:24 +08:00
weiwei_150212
b8a258d26f Fix error lua roll back 5.3.5 2020-08-12 16:13:39 +08:00
openeuler-ci-bot
02057c4730 !3 Fix make test error because lua update version 5.4.0
Merge pull request !3 from 温占礼/master
2020-08-07 16:49:41 +08:00
zhanliwen
bb88a907bf Fix make test error 2020-08-07 16:29:28 +08:00
3 changed files with 45 additions and 8 deletions

View File

@ -0,0 +1,12 @@
diff -up luaexpat-1.3.0/tests/test.lua.improve luaexpat-1.3.0/tests/test.lua
--- luaexpat-1.3.0/tests/test.lua.improve 2020-06-29 22:26:26.128128387 -0400
+++ luaexpat-1.3.0/tests/test.lua 2020-06-29 22:27:34.692014057 -0400
@@ -355,7 +355,7 @@ for i=1,100000 do
lxp.new({})
end
collectgarbage(); collectgarbage()
-assert(math.abs(gcinfo() - x) <= 2)
+assert(math.abs((gcinfo and gcinfo() or collectgarbage("count")) - x) <= 5, "Garbage collection test didn't pass!")
print"OK"

View File

@ -1,16 +1,19 @@
%define luaver 5.3
# this macro is needed for bumping version of lua
%global luaver %(lua -e "print(string.sub(_VERSION, 5))" || echo 0)
%define lualibdir %{_libdir}/lua/%{luaver}
%define luapkgdir %{_datadir}/lua/%{luaver}
Name: lua-expat
Version: 1.3.0
Release: 16
Release: 20
Summary: A SAX XML parser based on the Expat library
License: MIT
URL: http://www.keplerproject.org/luaexpat/
Source0: http://matthewwild.co.uk/projects/luaexpat/luaexpat-%{version}.tar.gz
BuildRequires: lua >= %{luaver} lua-devel >= %{luaver} gcc expat-devel gdb
Patch6000: lua-expat-1.3.0-improve-test.patch
BuildRequires: lua >= %{luaver} lua-devel >= %{luaver} gcc expat-devel
Requires: lua(abi) = %{luaver}
%description
@ -22,7 +25,7 @@ processing of the document, handling the document elements or text.
%package_help
%prep
%autosetup -n luaexpat-%{version}
%autosetup -n luaexpat-%{version} -p1
%build
%make_build LUA_V=%{luaver} LUA_CDIR=%{lualibdir} LUA_LDIR=%{luapkgdir} LUA_INC=-I%{_includedir} EXPAT_INC=-I%{_includedir} \
@ -54,6 +57,27 @@ lua -e 'package.cpath="./src/?.so;" .. package.cpath; package.path="./src/?.lua;
%doc doc/us/*
%changelog
* Fri Jul 23 2021 yuanxin<yuanxin24@huawei.com> - 1.3.0-20
- remove BuildRequires gdb
* Fri Aug 14 2020 shenyangyang<shenyangyang4@huawei.com> - 1.3.0-19
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Modify macro of luaver for bumping version of lua
* Wed Aug 12 2020 wenzhanli<wenzhanli2@huawei.com> - 1.3.0-18
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix unresolvable because lua roll back version 5.3.5
* Fri Aug 7 2020 wenzhanli<wenzhanli2@huawei.com> - 1.3.0-17
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix make test because lua update version 5.4.0
* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.0-16
- add necessary BuildRequires

View File

@ -1,4 +1,5 @@
version_control: NA
src_repo: "http://matthewwild.co.uk/projects/luaexpat/"
tag_prefix: NA
seperator: NA
git_url: https://github.com/LuaDist/luaexpat.git
version_control: github
src_repo: LuaDist/luaexpat
tag_prefix:
seperator: "."