testing/coreutils
SHA256
3
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

Accepting request 10077 from home:llunak:virtuoso

Browse Source 
Copy from IBS home:uli_suse/coreutils based on submit request 10077 from user uli_suse

OBS-URL: https://build.opensuse.org/request/show/10077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=51
This commit is contained in:
Marcus Rückert 2011-01-14 13:58:48 +00:00 committed by Git OBS Bridge
parent 731183e1ec
commit 29475acb95
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service:set_version:coreutils.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package coreutils (Version 8.9)
# spec file for package coreutils
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/coreutils/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.9
Release: 1
Release: 2
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@ -55,6 +55,7 @@ Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
@ -94,6 +95,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch30 -p1
%patch31
%patch32
%patch33
cp %{S:4} po/de.po
%build

15
coreutils-8.9-singlethreaded-sort.patch Normal file
View File

@ -0,0 +1,15 @@
Index: src/sort.c
===================================================================
--- src/sort.c.orig
+++ src/sort.c
@@ -5263,8 +5263,8 @@ main (int argc, char **argv)
{
if (!nthreads)
{
- unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE);
- nthreads = MIN (np, DEFAULT_MAX_THREADS);
+ //unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE);
+ nthreads = 1; //MIN (np, DEFAULT_MAX_THREADS);
}
/* Avoid integer overflow later. */

6
coreutils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 14 14:13:28 CET 2011 - uli@suse.de
- sort threading still broken, it deadlocks occasionally; set
default number of threads to 1 as a workaround
-------------------------------------------------------------------
Wed Jan 5 14:25:16 CET 2011 - pth@suse.de

6
coreutils.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package coreutils (Version 8.9)
# spec file for package coreutils
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/coreutils/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.9
Release: 1
Release: 2
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@ -55,6 +55,7 @@ Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
Patch30: coreutils-8.6-compile-su-with-fpie.diff
Patch31: coreutils-getaddrinfo.patch
Patch32: coreutils-ptr_int_casts.patch
Patch33: coreutils-8.9-singlethreaded-sort.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# this will create a cycle, broken up randomly - coreutils is just too core to have other
# prerequires
@ -94,6 +95,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
%patch30 -p1
%patch31
%patch32
%patch33
cp %{S:4} po/de.po
%build