From 4416cca4ae6b5d3fa2fa1d5806dd9615ec9ba24b0f4f88e55b4dcdcfc214362b Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Thu, 8 Nov 2012 21:44:01 +0000 Subject: [PATCH 1/3] - Update to version 2.0.8 - Removed __DATE__ in numastat to avoid constant rebuilding in build service - adjusted license strings OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=36 --- numactl-2.0.7.tar.gz | 3 --- numactl-2.0.8.tar.gz | 3 +++ numactl.changes | 8 ++++++++ numactl.spec | 22 +++++++++++++--------- revert_date_in_numastat.patch | 24 ++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 12 deletions(-) delete mode 100644 numactl-2.0.7.tar.gz create mode 100644 numactl-2.0.8.tar.gz create mode 100644 revert_date_in_numastat.patch diff --git a/numactl-2.0.7.tar.gz b/numactl-2.0.7.tar.gz deleted file mode 100644 index 6b411cb..0000000 --- a/numactl-2.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a1e237a98649c5cd2db7c684afe33bb81d290b406cf00d0469bdba9a11b39ef -size 275686 diff --git a/numactl-2.0.8.tar.gz b/numactl-2.0.8.tar.gz new file mode 100644 index 0000000..8c287c1 --- /dev/null +++ b/numactl-2.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f5bb6d1d5556235ec3b1ed40094d5bc2502e5bacc213d324088d63fa531c9ea +size 339373 diff --git a/numactl.changes b/numactl.changes index 1365265..424b194 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 8 21:39:52 UTC 2012 - trenn@suse.de + +- Update to version 2.0.8 +- Removed __DATE__ in numastat to avoid constant rebuilding in build + service +- adjusted license strings + ------------------------------------------------------------------- Wed Oct 12 22:06:22 UTC 2011 - tabraham@novell.com diff --git a/numactl.spec b/numactl.spec index 41b2676..1094e02 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,7 +1,7 @@ # # spec file for package numactl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,20 +20,19 @@ Url: http://oss.sgi.com/projects/libnuma/ Name: numactl -License: GPLv2+ +License: GPL-2.0+ Summary: NUMA Policy Control -Version: 2.0.7 +Version: 2.0.8 Release: 8 -%define origversion 2.0.7 AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: numactl-64bit %endif # -Source: numactl-%{origversion}.tar.gz +Source: ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz Source2: baselibs.conf -Patch0: numactl_install_all_manpages +Patch0: revert_date_in_numastat.patch Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc @@ -44,7 +43,7 @@ Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. %package -n libnuma1 -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: NUMA Policy Control Group: Development/Languages/C and C++ AutoReqProv: on @@ -54,7 +53,7 @@ Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. %package -n libnuma-devel -License: GPLv2+ +License: GPL-2.0+ Summary: NUMA Policy Control Group: Development/Languages/C and C++ AutoReqProv: on @@ -65,10 +64,15 @@ Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. %prep -%setup -q -n %{name}-%{origversion} +%setup -q %patch0 -p1 %build +# looks like a numactl mainline bug, will propably be fixed +# until next update and the rm line can get removed again. +# Remove the empty file, so that numstat gets build: +rm numastat + make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" %install diff --git a/revert_date_in_numastat.patch b/revert_date_in_numastat.patch new file mode 100644 index 0000000..f9bcc43 --- /dev/null +++ b/revert_date_in_numastat.patch @@ -0,0 +1,24 @@ +numactl: Revert __DATE__ in numastat + +or this will trigger unnecessary, constant rebuilds in build +service environments. + +Signed-off-by: Thomas Renninger + +--- + numastat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: numactl-2.0.8/numastat.c +=================================================================== +--- numactl-2.0.8.orig/numastat.c ++++ numactl-2.0.8/numastat.c +@@ -725,7 +725,7 @@ double huge_page_size_in_bytes = 0; + + void display_version_and_exit() { + char *version_string = "20120821"; +- printf("%s version: %s: %s\n", prog_name, version_string, __DATE__); ++ printf("%s version: %s\n", prog_name, version_string); + exit(EXIT_SUCCESS); + } + From 140eb7d96956d0f89031d4e60765dc7f2833f5657a468643529d959e6464e73f Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Thu, 8 Nov 2012 21:48:12 +0000 Subject: [PATCH 2/3] Revert unused patch OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=37 --- numactl_install_all_manpages | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 numactl_install_all_manpages diff --git a/numactl_install_all_manpages b/numactl_install_all_manpages deleted file mode 100644 index 4239137..0000000 --- a/numactl_install_all_manpages +++ /dev/null @@ -1,18 +0,0 @@ ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -Index: numactl-2.0.6/Makefile -=================================================================== ---- numactl-2.0.6.orig/Makefile -+++ numactl-2.0.6/Makefile -@@ -136,6 +136,9 @@ install: numactl migratepages migspeed n - install -m 0755 memhog ${prefix}/bin - mkdir -p ${prefix}/share/man/man2 ${prefix}/share/man/man8 ${prefix}/share/man/man3 - install -m 0644 numactl.8 ${prefix}/share/man/man8 -+ install -m 0644 numastat.8 ${prefix}/share/man/man8 -+ install -m 0644 migratepages.8 ${prefix}/share/man/man8 -+ install -m 0644 migspeed.8 ${prefix}/share/man/man8 - install -m 0644 numa.3 ${prefix}/share/man/man3 - ( cd ${prefix}/share/man/man3 ; for i in $$(./manlinks) ; do ln -sf numa.3 $$i.3 ; done ) - mkdir -p ${libdir} From e3e70acc6568274988c1bfeebffa42507851c239f9ec1c2b6c3e4fdc7b6d0191 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 16 Apr 2013 09:16:34 +0000 Subject: [PATCH 3/3] Accepting request 171040 from home:a_jaeger:FactoryFix Update changes file to mention patches) OBS-URL: https://build.opensuse.org/request/show/171040 OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=38 --- numactl.changes | 5 +++-- numactl.spec | 16 ++++++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/numactl.changes b/numactl.changes index 424b194..3f89ce1 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- Thu Nov 8 21:39:52 UTC 2012 - trenn@suse.de -- Update to version 2.0.8 +- Update to version 2.0.8: + Drop patch numactl_install_all_manpages, merged upstream - Removed __DATE__ in numastat to avoid constant rebuilding in build - service + service (added patch revert_date_in_numastat.patch) - adjusted license strings ------------------------------------------------------------------- diff --git a/numactl.spec b/numactl.spec index 1094e02..b4e46dd 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,7 +1,7 @@ # # spec file for package numactl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Url: http://oss.sgi.com/projects/libnuma/ Name: numactl -License: GPL-2.0+ Summary: NUMA Policy Control +License: GPL-2.0+ +Group: System/Management Version: 2.0.8 -Release: 8 -AutoReqProv: on +Release: 0 # bug437293 %ifarch ppc64 Obsoletes: numactl-64bit @@ -33,7 +32,6 @@ Obsoletes: numactl-64bit Source: ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz Source2: baselibs.conf Patch0: revert_date_in_numastat.patch -Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc Requires: perl @@ -43,20 +41,18 @@ Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. %package -n libnuma1 -License: LGPL-2.1+ Summary: NUMA Policy Control +License: LGPL-2.1+ Group: Development/Languages/C and C++ -AutoReqProv: on %description -n libnuma1 Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. %package -n libnuma-devel -License: GPL-2.0+ Summary: NUMA Policy Control +License: GPL-2.0+ Group: Development/Languages/C and C++ -AutoReqProv: on Requires: libnuma1 = %{version} %description -n libnuma-devel