From ba8ed4ef564e3faf25ceaa697bc0c73d978a499d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Aug 2023 09:45:31 +0200 Subject: update to 1.31.0 --- unit.spec | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/unit.spec b/unit.spec index 283a32e..83ddb92 100644 --- a/unit.spec +++ b/unit.spec @@ -8,15 +8,17 @@ # %bcond_without tests +# require ONLINE build for sources download +%bcond_with wasm %global gh_owner nginx %global project unit -%global gh_commit fcf1628b2c2014fab0ce227aab160bc61bc8d535 +%global gh_commit fd43b1b0ce8682b5af7316a2ada1d88e20091dbf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) Name: unit Summary: NGINX Unit application server -Version: 1.30.0 +Version: 1.31.0 Release: 1%{?dist} License: Apache-2.0 URL: https://unit.nginx.org/ @@ -32,6 +34,10 @@ BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: systemd +%if %{with wasm} +BuildRequires: clang +BuildRequires: llvm +%endif %{?systemd_requires} Requires(pre): /usr/sbin/useradd @@ -74,7 +80,9 @@ unitconf() { --statedir=%{_sharedstatedir}/unit \ --control="unix:/run/unit/control.sock" \ --pid=/run/unit/unit.pid \ + --runstatedir=/var/run \ --log=/var/log/unit/unit.log \ + --logdir=/var/log \ --tmpdir=/var/tmp \ --user=unit \ --group=unit \ @@ -91,6 +99,10 @@ make %{?_smp_mflags} make %{?_smp_mflags} build/lib/libunit.a mv build build-debug +%if %{with wasm} +make %{?_smp_mflags} -C pkg/contrib .libunit-wasm +%endif + unitconf \ --modulesdir=%{_libdir}/unit/modules make %{?_smp_mflags} @@ -118,6 +130,12 @@ install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d +%if %{with wasm} +mkdir -p %{buildroot}%{_includedir}/unit/ +install -m 644 pkg/contrib/libunit-wasm/src/c/libunit-wasm.a %{buildroot}%{_libdir}/ +install -m 644 pkg/contrib/libunit-wasm/src/c/include/unit/unit-wasm.h %{buildroot}%{_includedir}/unit/ +%endif + %check %if %{with tests} @@ -183,10 +201,19 @@ BANNER # API is not stable YET, so keep the static library for now (like upstream packages) %{_libdir}/libunit.a %{_libdir}/libunit-debug.a +%if %{with wasm} +%{_libdir}/libunit-wasm.a +%dir %{_includedir}/unit +%{_includedir}/unit/*.h +%endif %{_includedir}/nxt_*.h +%{_datadir}/pkgconfig/unit.pc %changelog +* Thu Aug 31 2023 Remi Collet - 1.31.0-1 +- update to 1.31.0 + * Thu May 11 2023 Remi Collet - 1.30.0-1 - update to 1.30.0 - add unitc and setup-unit commands -- cgit