From 2971e4e6b785f06f13ae650f4b92692e87ca6b08 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jul 22 2022 20:36:01 +0000 Subject: Update to 1.1.49 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index d163677..f32170d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /fast_xml-1.1.37.tar.gz /fast_xml-1.1.38.tar.gz /fast_xml-1.1.43.tar.gz +/fast_xml-1.1.49.tar.gz diff --git a/erlang-fast_xml-0001-Disable-port-compiler-until-we-package-it.patch b/erlang-fast_xml-0001-Disable-port-compiler-until-we-package-it.patch new file mode 100644 index 0000000..f910509 --- /dev/null +++ b/erlang-fast_xml-0001-Disable-port-compiler-until-we-package-it.patch @@ -0,0 +1,24 @@ +From: Peter Lemenkov +Date: Fri, 22 Jul 2022 21:14:10 +0200 +Subject: [PATCH] Disable port compiler until we package it + +Signed-off-by: Peter Lemenkov + +diff --git a/rebar.config.script b/rebar.config.script +index ee6cbf2..976e5c0 100644 +--- a/rebar.config.script ++++ b/rebar.config.script +@@ -133,13 +133,6 @@ Rules = [ + AppendStr("--coverage"), ""}, + {[deps], IsRebar3, + Rebar3DepsFilter, []}, +- {[plugins], IsRebar3, +- AppendList([pc]), []}, +- {[provider_hooks], IsRebar3, +- AppendList([{pre, [ +- {compile, {pc, compile}}, +- {clean, {pc, clean}} +- ]}]), []}, + {[plugins], os:getenv("COVERALLS") == "true", + AppendList([{coveralls, {git, + "https://github.com/processone/coveralls-erl.git", diff --git a/erlang-fast_xml.spec b/erlang-fast_xml.spec index e21dabc..569cdac 100644 --- a/erlang-fast_xml.spec +++ b/erlang-fast_xml.spec @@ -3,25 +3,21 @@ %global p1_utils_ver 1.0.20 Name: erlang-%{srcname} -Version: 1.1.43 -Release: 6%{?dist} - +Version: 1.1.49 +Release: 1%{?dist} License: ASL 2.0 Summary: Fast Expat based Erlang XML parsing and manipulation library URL: https://github.com/processone/fast_xml/ Source0: https://github.com/processone/fast_xml/archive/%{version}/%{srcname}-%{version}.tar.gz - +Patch1: erlang-fast_xml-0001-Disable-port-compiler-until-we-package-it.patch Provides: erlang-p1_xml = %{version}-%{release} Obsoletes: erlang-p1_xml < 1.1.11 - BuildRequires: gcc BuildRequires: erlang-edoc -BuildRequires: erlang-rebar +BuildRequires: erlang-rebar3 BuildRequires: erlang-p1_utils >= %{p1_utils_ver} BuildRequires: expat-devel -Requires: erlang-p1_utils >= %{p1_utils_ver} - %description Fast Expat based Erlang XML parsing and manipulation library, with a strong @@ -38,17 +34,24 @@ than calling xmerl_scan:string/2. %build -%{rebar_compile} +%{erlang3_compile} + +# FIXME we don't have a port compiler plugin for rebar3 yet +mkdir -p priv/lib +gcc c_src/fxml.c $CFLAGS -fPIC -c -I%{_libdir}/erlang/usr/include -o c_src/fxml.o +gcc c_src/fxml_stream.c $CFLAGS -fPIC -c -I%{_libdir}/erlang/usr/include -o c_src/fxml_stream.o +gcc c_src/fxml.o $LDFLAGS -shared -L%{_libdir}/erlang/usr/lib -lei -L%{_libdir} -lexpat -lm -o priv/lib/fxml.so +gcc c_src/fxml_stream.o $LDFLAGS -shared -L%{_libdir}/erlang/usr/lib -lei -L%{_libdir} -lexpat -lm -o priv/lib/fxml_stream.so %install -%{erlang_install} +%{erlang3_install} install -p -D -m 755 priv/lib/* --target-directory=$RPM_BUILD_ROOT%{_erllibdir}/%{srcname}-%{version}/priv/lib/ %check -%{rebar_eunit} +%{erlang3_test} %files @@ -58,6 +61,10 @@ install -p -D -m 755 priv/lib/* --target-directory=$RPM_BUILD_ROOT%{_erllibdir}/ %changelog +* Thu Jul 21 2022 Peter Lemenkov - 1.1.49-1 +- Rebuild for Erlang 25 +- Ver. 1.1.49 + * Thu Jul 21 2022 Fedora Release Engineering - 1.1.43-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 5cf5f18..c750125 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fast_xml-1.1.43.tar.gz) = d3644238f484bdd320e80fa68a86f48b8c7a9428cfb317bdaf1037c98428240120626e867347addfdaae5fe262a17e20f802c6c733c7938beefeda83617da8e8 +SHA512 (fast_xml-1.1.49.tar.gz) = c33e94865b676f0011f21f9434e0ac3c019abdad7cf0b229a4dcad8bf6c26d4d84585e013cc8257cbb4da4a4f4d5216702dbf2eda15bd333fd429d260e6e85f5