diff --git a/.gitignore b/.gitignore index a48def9..556e43d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/numactl-2.0.16.tar.gz +numactl-2.0.16.tar.gz diff --git a/.numactl.metadata b/.numactl.metadata deleted file mode 100644 index a2a0c0b..0000000 --- a/.numactl.metadata +++ /dev/null @@ -1 +0,0 @@ -37ea1a333827f279e940bf0ae55d6897b331f19f SOURCES/numactl-2.0.16.tar.gz diff --git a/SOURCES/0001-fix-typo-in-memhog.8.patch b/SOURCES/0001-fix-typo-in-memhog.8.patch deleted file mode 100644 index 664abdb..0000000 --- a/SOURCES/0001-fix-typo-in-memhog.8.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/SPECS/numactl.spec b/numactl.spec similarity index 73% rename from SPECS/numactl.spec rename to numactl.spec index 3810a4f..4054473 100644 --- a/SPECS/numactl.spec +++ b/numactl.spec @@ -1,46 +1,18 @@ Name: numactl Summary: Library for tuning for Non Uniform Memory Access machines Version: 2.0.16 -Release: 4%{?dist} +Release: 6%{dist} # libnuma is LGPLv2 and GPLv2 # numactl binaries are GPLv2 only -License: GPLv2 -Group: System Environment/Base +License: GPL-2.0-only URL: https://github.com/numactl/numactl -Source0: https://github.com/numactl/numactl/releases/download/%{version}/numactl-%{version}.tar.gz -Buildroot: %{_tmppath}/%{name}-buildroot -BuildRequires: libtool automake autoconf +Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz + +BuildRequires: make +BuildRequires: libtool automake autoconf ExcludeArch: s390 %{arm} -#START INSERT -# -# Patches 0 through 100 are meant for x86 -# - -# -# Patches 101 through 200 are meant for x86_64 -# - -# -# Patches 301 through 400 are meant for ppc64le -# - -# -# Patches 401 through 500 are meant for s390x -# - -# -# Patches 501 through 600 are meant for aarch64 -# - -# -# Patches 601 onward are generic patches -# -Patch601: 0001-fix-typo-in-memhog.8.patch - - - %description Simple NUMA policy support. It consists of a numactl program to run other programs with a specific NUMA policy. @@ -48,8 +20,7 @@ other programs with a specific NUMA policy. %package libs Summary: libnuma libraries # There is a tiny bit of GPLv2 code in libnuma.c -License: LGPLv2 and GPLv2 -Group: System Environment/Libraries +License: LGPL-2.1-only and GPL-2.0-only %description libs numactl-libs provides libnuma, a library to do allocations with @@ -57,36 +28,25 @@ NUMA policy in applications. %package devel Summary: Development package for building Applications that use numa -Group: System Environment/Libraries Requires: %{name}-libs = %{version}-%{release} -License: LGPLv2 and GPLv2 +License: LGPL-2.1-only and GPL-2.0-only %description devel Provides development headers for numa library calls %prep -%setup -q -n %{name}-%{version} - -#patch -%patch601 -p1 - +%autosetup %build -aclocal && automake %configure --prefix=/usr --libdir=%{_libdir} -make clean -make CFLAGS="$RPM_OPT_FLAGS -I." +%make_build %install rm -rf $RPM_BUILD_ROOT +%make_install -make DESTDIR=$RPM_BUILD_ROOT install - -%post -p /sbin/ldconfig -%post libs -p /sbin/ldconfig - -%postun -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets libs %files %doc README.md @@ -105,39 +65,79 @@ make DESTDIR=$RPM_BUILD_ROOT install %files devel %{_libdir}/libnuma.so -%{_libdir}/pkgconfig/numa.pc %exclude %{_libdir}/libnuma.a -%exclude %{_libdir}/libnuma.la +%{_libdir}/pkgconfig/numa.pc %{_includedir}/numa.h %{_includedir}/numaif.h %{_includedir}/numacompat1.h %{_mandir}/man3/*.3* %changelog -* Thu Sep 14 2023 Pingfan Liu - 2.0.16-2 -- fix typo in memhog.8 -- Remove contained patches +* Mon Jun 24 2024 Troy Dawson - 2.0.16-6 +- Bump release for June 2024 mass rebuild -* Wed May 12 2021 Pingfan Liu - 2.0.12-13 -- libnuma: make numa_police_memory() free of race +* Thu Jan 25 2024 Fedora Release Engineering - 2.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Sat May 9 2020 Pingfan Liu - 2.0.12-11 -- Update manpage description of --localalloc option +* Sun Jan 21 2024 Fedora Release Engineering - 2.0.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Mar 13 2020 Pingfan Liu - 2.0.12-10 -- memhog : add man page +* Thu Jul 20 2023 Fedora Release Engineering - 2.0.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Mon Apr 1 2019 Pingfan Liu - 2.0.12-3 -- add gating test cases +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Mon Nov 26 2018 Pingfan Liu - 2.0.12-2 -- Fix: Add ShmemHugePages and ShmemPmdMapped to system_meminfo[] +* Sat Oct 08 2022 Filipe Brandenburger - 2.0.16-1 +- Upgrade to 2.0.16 -* Mon Nov 5 2018 Pingfan Liu - 2.0.12-1 -- Rebase to 2.0.12 +* Fri Jul 22 2022 Fedora Release Engineering - 2.0.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Fri Aug 10 2018 Lianbo Jiang - 2.0.11-8%{dist} -- Fix compilation error (bz1611734) +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.0.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 11 2020 Florian Weimer - 2.0.14-2 +- Trigger rebuild to avoid DT_INIT/DT_FINI with zero values + +* Thu Sep 17 2020 Filipe Brandenburger - 2.0.14-1 +- Upgrade to 2.0.14 +- Re-enabled LTO, now that upstream has been fixed to support it. + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 01 2020 Jeff Law - 2.0.12-5 +- Disable LTO + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jul 25 2018 Filipe Brandenburger - 2.0.12-1 +- Rebased to version 2.0.12 + +* Wed Jul 25 2018 Filipe Brandenburger +- Fix check-rpaths warning about including /usr/lib64 in RPATH of the binaries. + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Mar 24 2018 Richard W.M. Jones - 2.0.11-9%{dist} +- Fix major/minor macros on glibc 2.27. +- Update config.{guess,sub} with versions which understand riscv64. +- Remove obsolete Buildroot tag. * Sat Feb 24 2018 Florian Weimer - 2.0.11-8%{dist} - Use LDFLAGS from redhat-rpm-config diff --git a/sources b/sources new file mode 100644 index 0000000..f673441 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (numactl-2.0.16.tar.gz) = 6e17724567c363a08994fe7f5569b6ec62bd1ae608244945fddcb2d6a212b08140340f0d862595ba4016fcba95193e851cb286798f685d314b4c72687af6d879