pool/coreutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 186198 from Base:System

Browse Source 
- Remove "BuildRequires: help2man" as it is included. (forwarded request 186183 from bernhard-voelker)

OBS-URL: https://build.opensuse.org/request/show/186198
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=93
This commit is contained in:
Tomáš Chvátal 2013-08-13 09:09:27 +00:00 committed by Git OBS Bridge
parent 57fb7ae9aa
commit 97b29762aa
5 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
coreutils-8.9-singlethreaded-sort.patch
View File

@ -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);
}

13
coreutils-testsuite.changes
View File

@ -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 Tue Jul 23 13:22:21 UTC 2013 - mail@bernhard-voelker.de

5
coreutils-testsuite.spec
View File

@ -35,7 +35,6 @@ Release: 0
BuildRequires: automake BuildRequires: automake
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: help2man
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
@ -52,7 +51,6 @@ BuildRequires: strace
BuildRequires: valgrind BuildRequires: valgrind
%endif %endif
Provides: %{name} = %{version}
%if "%{name}" == "coreutils" %if "%{name}" == "coreutils"
Provides: fileutils = %{version} Provides: fileutils = %{version}
Provides: mktemp = %{version} Provides: mktemp = %{version}
@ -95,8 +93,6 @@ Patch4: coreutils-i18n.patch
Patch8: coreutils-sysinfo.patch Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch Patch16: coreutils-invalid-ids.patch
Patch17: longlong-aarch64.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. # OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option.
Patch100: coreutils-build-timeout-as-pie.patch Patch100: coreutils-build-timeout-as-pie.patch
@ -134,7 +130,6 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch16 %patch16
%patch17 -p1 %patch17 -p1
# #
#%%patch33
%patch100 %patch100
%patch200 %patch200

13
coreutils.changes
View File

@ -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 Tue Jul 23 13:22:21 UTC 2013 - mail@bernhard-voelker.de

5
coreutils.spec
View File

@ -35,7 +35,6 @@ Release: 0
BuildRequires: automake BuildRequires: automake
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: help2man
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
@ -52,7 +51,6 @@ BuildRequires: strace
BuildRequires: valgrind BuildRequires: valgrind
%endif %endif
Provides: %{name} = %{version}
%if "%{name}" == "coreutils" %if "%{name}" == "coreutils"
Provides: fileutils = %{version} Provides: fileutils = %{version}
Provides: mktemp = %{version} Provides: mktemp = %{version}
@ -95,8 +93,6 @@ Patch4: coreutils-i18n.patch
Patch8: coreutils-sysinfo.patch Patch8: coreutils-sysinfo.patch
Patch16: coreutils-invalid-ids.patch Patch16: coreutils-invalid-ids.patch
Patch17: longlong-aarch64.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. # OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option.
Patch100: coreutils-build-timeout-as-pie.patch Patch100: coreutils-build-timeout-as-pie.patch
@ -134,7 +130,6 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch16 %patch16
%patch17 -p1 %patch17 -p1
# #
#%%patch33
%patch100 %patch100
%patch200 %patch200