lua-expat-1.3.0-improve-test.patch

@@ -1,12 +0,0 @@
-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"

lua-expat.spec

@@ -1,19 +1,16 @@
-# this macro is needed for bumping version of lua
+%define luaver 5.3
-%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:        20
+Release:        16
 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
 
-Patch6000: 	lua-expat-1.3.0-improve-test.patch
+BuildRequires:  lua >= %{luaver} lua-devel >= %{luaver} gcc expat-devel gdb
-
-BuildRequires:  lua >= %{luaver} lua-devel >= %{luaver} gcc expat-devel 
 Requires:       lua(abi) = %{luaver}
 
 %description
@@ -25,7 +22,7 @@ processing of the document, handling the document elements or text.
 %package_help
 
 %prep
-%autosetup -n luaexpat-%{version} -p1
+%autosetup -n luaexpat-%{version}
 
 %build
 %make_build LUA_V=%{luaver} LUA_CDIR=%{lualibdir} LUA_LDIR=%{luapkgdir} LUA_INC=-I%{_includedir} EXPAT_INC=-I%{_includedir} \
@@ -57,27 +54,6 @@ 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
 

lua-expat.yaml

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