diff --git a/coreutils-8.9-singlethreaded-sort.patch b/coreutils-8.9-singlethreaded-sort.patch deleted file mode 100644 index 376457b..0000000 --- a/coreutils-8.9-singlethreaded-sort.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/sort.c -=================================================================== ---- src/sort.c.orig -+++ src/sort.c -@@ -5291,7 +5291,11 @@ main (int argc, char **argv) - { - if (!nthreads) - { -- unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE); -+ unsigned long int np; -+ if (getenv("OMP_NUM_THREADS")) -+ np = num_processors (NPROC_CURRENT_OVERRIDABLE); -+ else -+ np = 1; - nthreads = MIN (np, DEFAULT_MAX_THREADS); - } - diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index 0210182..7d477e1 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Aug 7 08:10:22 UTC 2013 - mail@bernhard-voelker.de + +- Remove "BuildRequires: help2man" as it is included. + +------------------------------------------------------------------- +Tue Aug 6 14:02:42 CEST 2013 - pth@suse.de + +- Remove the the unnecessary povision of itself as rpmbuild takes + care of that. +- Remove all traces of coreutils-8.9-singlethreaded-sort.patch in + the spec file. + ------------------------------------------------------------------- Tue Jul 23 13:22:21 UTC 2013 - mail@bernhard-voelker.de diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index 5aa41da..0060b24 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -35,7 +35,6 @@ Release: 0 BuildRequires: automake BuildRequires: gmp-devel -BuildRequires: help2man BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libcap-devel @@ -52,7 +51,6 @@ BuildRequires: strace BuildRequires: valgrind %endif -Provides: %{name} = %{version} %if "%{name}" == "coreutils" Provides: fileutils = %{version} Provides: mktemp = %{version} @@ -95,8 +93,6 @@ Patch4: coreutils-i18n.patch Patch8: coreutils-sysinfo.patch Patch16: coreutils-invalid-ids.patch Patch17: longlong-aarch64.patch -# -#Patch33: coreutils-8.9-singlethreaded-sort.patch # OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option. Patch100: coreutils-build-timeout-as-pie.patch @@ -134,7 +130,6 @@ the GNU fileutils, sh-utils, and textutils packages. %patch16 %patch17 -p1 # -#%%patch33 %patch100 %patch200 diff --git a/coreutils.changes b/coreutils.changes index 0210182..7d477e1 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Aug 7 08:10:22 UTC 2013 - mail@bernhard-voelker.de + +- Remove "BuildRequires: help2man" as it is included. + +------------------------------------------------------------------- +Tue Aug 6 14:02:42 CEST 2013 - pth@suse.de + +- Remove the the unnecessary povision of itself as rpmbuild takes + care of that. +- Remove all traces of coreutils-8.9-singlethreaded-sort.patch in + the spec file. + ------------------------------------------------------------------- Tue Jul 23 13:22:21 UTC 2013 - mail@bernhard-voelker.de diff --git a/coreutils.spec b/coreutils.spec index f3675cf..e52990c 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -35,7 +35,6 @@ Release: 0 BuildRequires: automake BuildRequires: gmp-devel -BuildRequires: help2man BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libcap-devel @@ -52,7 +51,6 @@ BuildRequires: strace BuildRequires: valgrind %endif -Provides: %{name} = %{version} %if "%{name}" == "coreutils" Provides: fileutils = %{version} Provides: mktemp = %{version} @@ -95,8 +93,6 @@ Patch4: coreutils-i18n.patch Patch8: coreutils-sysinfo.patch Patch16: coreutils-invalid-ids.patch Patch17: longlong-aarch64.patch -# -#Patch33: coreutils-8.9-singlethreaded-sort.patch # OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option. Patch100: coreutils-build-timeout-as-pie.patch @@ -134,7 +130,6 @@ the GNU fileutils, sh-utils, and textutils packages. %patch16 %patch17 -p1 # -#%%patch33 %patch100 %patch200