From ee39aa6c6f024f44a925dcf18473ddf85f26a8bd Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 21 May 2024 14:46:27 +0800 Subject: [PATCH 1/2] update to numactl-2.0.16-3.src.rpm Signed-off-by: Zhao Hang --- 0001-fix-typo-in-memhog.8.patch | 26 ++++++++++++++++++++++++++ numactl.spec | 20 +++++--------------- 2 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 0001-fix-typo-in-memhog.8.patch diff --git a/0001-fix-typo-in-memhog.8.patch b/0001-fix-typo-in-memhog.8.patch new file mode 100644 index 0000000..664abdb --- /dev/null +++ b/0001-fix-typo-in-memhog.8.patch @@ -0,0 +1,26 @@ +From 66308a7e30a964aaad324f74c74eb5b9d75a2abd Mon Sep 17 00:00:00 2001 +From: Pingfan Liu +Date: Mon, 12 Jun 2023 21:15:39 +0800 +Subject: [PATCH] fix typo in memhog.8 + +Signed-off-by: Pingfan Liu +--- + memhog.8 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memhog.8 b/memhog.8 +index e28e784..3846e08 100644 +--- a/memhog.8 ++++ b/memhog.8 +@@ -52,7 +52,7 @@ thread is running on) + # Allocate a 1G region, mmap backed by memhog.mmap file, membind to node 0, repeat test 6 times + memhog -r6 1G --membind 0 -fmemhog.mmap + .TP +-# Allocate a 1G region, iterleave across nodes 0,1,2,3, repeat test 4 times ++# Allocate a 1G region, interleave across nodes 0,1,2,3, repeat test 4 times + memhog -r4 1G --interleave 0-3 + .TP + # Allocate a 1G region, (implicit) default policy, repeat test 8 times +-- +2.31.1 + diff --git a/numactl.spec b/numactl.spec index ed1d8b0..f4828ea 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 Name: numactl Summary: Library for tuning for Non Uniform Memory Access machines Version: 2.0.16 -Release: 1%{anolis_release}%{dist} +Release: 3%{dist} # libnuma is LGPLv2 and GPLv2 # numactl binaries are GPLv2 only License: GPLv2 @@ -38,6 +37,7 @@ ExcludeArch: s390 %{arm} # # Patches 601 onward are generic patches # +Patch601: 0001-fix-typo-in-memhog.8.patch %description @@ -61,14 +61,6 @@ License: LGPLv2 and GPLv2 %description devel Provides development headers for numa library calls -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %autosetup @@ -91,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT %ldconfig_scriptlets libs %files +%doc README.md %{_bindir}/numactl %{_bindir}/numademo %{_bindir}/numastat @@ -114,12 +107,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/numacompat1.h %{_mandir}/man3/*.3* -%files doc -%doc README.md - %changelog -* Wed Dec 13 2023 Bo Ren - 2.0.14-9.0.1 -- Add doc sub package +* Thu Sep 14 2023 Pingfan Liu - 2.0.16-2 +- fix typo in memhog.8 * Wed Nov 23 2022 Pingfan Liu - 2.0.14-9 - Dummy release to get s390x binary in errata -- Gitee From dc5068650119bebdc663e185be7bab52a4f8972a Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Mon, 28 Nov 2022 11:32:48 +0800 Subject: [PATCH 2/2] Add doc sub package Signed-off-by: Bo Ren --- numactl.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/numactl.spec b/numactl.spec index f4828ea..b373960 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Name: numactl Summary: Library for tuning for Non Uniform Memory Access machines Version: 2.0.16 -Release: 3%{dist} +Release: 3%{anolis_release}%{dist} # libnuma is LGPLv2 and GPLv2 # numactl binaries are GPLv2 only License: GPLv2 @@ -61,6 +62,14 @@ License: LGPLv2 and GPLv2 %description devel Provides development headers for numa library calls +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %autosetup @@ -83,7 +92,6 @@ rm -rf $RPM_BUILD_ROOT %ldconfig_scriptlets libs %files -%doc README.md %{_bindir}/numactl %{_bindir}/numademo %{_bindir}/numastat @@ -107,7 +115,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/numacompat1.h %{_mandir}/man3/*.3* +%files doc +%doc README.md + %changelog +* Tue May 21 2024 Bo Ren - 2.0.16-2.0.1 +- Add doc sub package + * Thu Sep 14 2023 Pingfan Liu - 2.0.16-2 - fix typo in memhog.8 -- Gitee