From 08493af14bffc54e026bb23cea79efeb02670bcb Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Fri, 2 Jun 2023 22:58:54 +0300 Subject: [PATCH] Remove changes that have been merged upstream --- ucx.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ucx.spec b/ucx.spec index 93f14fc..72ac810 100644 --- a/ucx.spec +++ b/ucx.spec @@ -12,7 +12,7 @@ Name: ucx Version: 1.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: UCX is a communication library implementing high-performance messaging License: BSD-3-Clause AND MIT AND CC-PDDC AND (BSD-3-Clause OR Apache-2.0) @@ -96,14 +96,6 @@ Provides header files and examples for developing with UCX. %setup -q %build -# Remove these fixes when upgrading to version 1.14 -# Fix for improper declaration, upstream fix: -# https://github.com/openucx/ucx/commit/8d6032ec864190c9f079d96e731c5004a975e153 -sed -i 's/unsigned advice)/uct_mem_advice_t advice)/g' src/uct/base/uct_md.c -# Enable use of GCC 13, upstream fix: -# https://github.com/openucx/ucx/commit/8f70e898b43d1bde1ff3fae56bf0ac5aac285997 -sed -i '/#include / a #include ' test/apps/sockaddr/sa_util.h - %define _with_arg() %{expand:%%{?with_%{1}:--with-%{2}}%%{!?with_%{1}:--without-%{2}}} %define _enable_arg() %{expand:%%{?with_%{1}:--enable-%{2}}%%{!?with_%{1}:--disable-%{2}}} %configure --disable-optimizations \ @@ -319,6 +311,9 @@ status, and more. %endif %changelog +* Fri Jun 02 2023 Benson Muite - 1.14.1-2 +- Remove changes in patches that have been applied + * Fri Jun 02 2023 Kamal Heib - 1.14.1-1 - Update to upstream release 1.14.1