diff options
| -rw-r--r-- | unit-tests.patch | 49 | ||||
| -rw-r--r-- | unit.spec | 16 |
2 files changed, 7 insertions, 58 deletions
diff --git a/unit-tests.patch b/unit-tests.patch deleted file mode 100644 index 5c73995..0000000 --- a/unit-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c91f99facf5069359bb981ffa8daa7a0c72bc17c Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 20 Dec 2024 09:16:03 +0100 -Subject: [PATCH] add libotel for tests - ---- - auto/make | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/auto/make b/auto/make -index 183e95c75..e5e41a69c 100644 ---- a/auto/make -+++ b/auto/make -@@ -269,7 +269,7 @@ $NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ - \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ - \$(CFLAGS) \$(NXT_TEST_OBJS) \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ -- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS -+ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) - - $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC -@@ -278,7 +278,7 @@ $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ - -o $NXT_BUILD_DIR/utf8_file_name_test \\ - $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ -- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS -+ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) - - $NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC -@@ -286,7 +286,7 @@ $NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ - \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/ncq_test \\ - \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ -- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS -+ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) - - $NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC -@@ -294,7 +294,7 @@ $NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ - \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/vbcq_test \\ - \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ -- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS -+ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) - - $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ - $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC @@ -1,6 +1,6 @@ # remirepo/fedora spec file for unit-php # -# SPDX-FileCopyrightText: Copyright 2019-2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2019-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -17,13 +17,13 @@ %global gh_owner nginx %global project unit -%global gh_commit 27bde184dedcbf687db2f314c60c037623318a8d +%global gh_commit ed6f67d14dc5d03c2b5d10d5bb6eb237f9c9b896 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) Name: unit Summary: NGINX Unit application server -Version: 1.34.0 -Release: 2%{?dist} +Version: 1.34.1 +Release: 1%{?dist} # unit is Apache-2.0 # rust libraries are Apache-2.0 or MIT License: Apache-2.0 AND MIT @@ -38,9 +38,6 @@ Source4: unit.logrotate Source5: makedeps.sh Source6: %{project}-deps-%{version}.tgz -# add libotel.a to tests build -Patch0: unit-tests.patch - BuildRequires: make BuildRequires: gcc BuildRequires: openssl-devel @@ -89,8 +86,6 @@ Library and include files required for NGINX Unit modules development. %else %setup -qn %{project}-%{gh_commit} -a6 -%patch -P0 -p1 -b .otel - : Create cargo configuration to use vendor directory mkdir .cargo cat << EOF | tee .cargo/config.toml @@ -268,6 +263,9 @@ BANNER %changelog +* Mon Jan 13 2025 Remi Collet <remi@remirepo.net> - 1.34.1-1 +- update to 1.34.1 + * Thu Dec 19 2024 Remi Collet <remi@remirepo.net> - 1.34.0-2 - re-license spec file to CECILL-2.1 - enable otel support |