rpm/coreutils
SHA256
1
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=24

Browse Source
This commit is contained in:
OBS User unknown 2008-04-12 18:53:18 +00:00 committed by Git OBS Bridge
parent d6ae9f8578
commit e915ca7785
5 changed files with 112 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
coreutils-6.10.diff
View File

@ -1,5 +1,3 @@
Index: doc/coreutils.texi
================================================================================
--- doc/coreutils.texi
+++ doc/coreutils.texi
@@ -65,8 +65,6 @@
@ -20,7 +18,7 @@ Index: doc/coreutils.texi
@command{date}: Print or set system date and time
@@ -12452,8 +12448,6 @@ information.
@@ -12467,8 +12463,6 @@ information.
* arch invocation:: Print machine hardware name.
* date invocation:: Print or set system date and time.
* uname invocation:: Print system information.
@ -29,10 +27,11 @@ Index: doc/coreutils.texi
@end menu
@@ -13234,55 +13228,6 @@ Print the kernel version.
@@ -13248,55 +13242,6 @@ Print the kernel version.
@exitstatus
-
-@node hostname invocation
-@section @command{hostname}: Print or set system name
-
@ -81,13 +80,39 @@ Index: doc/coreutils.texi
-
-@exitstatus
-
-
@node Modified command invocation
@chapter Modified command invocation
--- gnulib-tests/test-isnanl.h
+++ gnulib-tests/test-isnanl.h
@@ -57,7 +57,7 @@ main ()
/* Quiet NaN. */
ASSERT (isnanl (0.0L / 0.0L));
-#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT
+#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT && 0
/* A bit pattern that is different from a Quiet NaN. With a bit of luck,
it's a Signalling NaN. */
{
@@ -99,6 +99,7 @@ main ()
{ LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
ASSERT (isnanl (x.value));
}
+#if 0
/* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities,
Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in
Intel IA-64 Architecture Software Developer's Manual, Volume 1:
@@ -132,6 +133,7 @@ main ()
ASSERT (isnanl (x.value));
}
#endif
+#endif
return 0;
}
--- m4/gnulib-comp.m4
+++ m4/gnulib-comp.m4
@@ -235,7 +235,6 @@ AC_DEFUN([gl_INIT],
@@ -234,7 +234,6 @@ AC_DEFUN([gl_INIT],
gl_POSIXVER
gl_FUNC_PRINTF_FREXP
gl_FUNC_PRINTF_FREXPL

6
coreutils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 11 11:42:57 CEST 2008 - schwab@suse.de
- Work around a recent glibc/getopt.c diagnostic change.
- Fix frexpl test.
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

22
coreutils.spec
View File

@ -11,18 +11,19 @@
Name: coreutils
Summary: GNU Core Utilities
BuildRequires: help2man libacl-devel pam-devel
Url: http://www.gnu.org/software/coreutils/
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v2 or later; GPL v3 or later
Group: System/Base
Version: 6.10
Release: 22
Provides: fileutils sh-utils stat textutils mktemp
Obsoletes: fileutils sh-utils stat textutils mktemp
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = 9 libselinux-x86 = 9
AutoReqProv: on
PreReq: %{install_info_prereq}
Version: 6.10
Release: 21
Summary: GNU Core Utilities
Requires: %{name}-lang = %version
Source: coreutils-%{version}.tar.gz
Source1: su.pamd
Source2: su.default
@ -33,6 +34,8 @@ Patch4: coreutils-5.3.0-i18n-0.1.patch
Patch5: i18n-uninit.diff
Patch6: i18n-infloop.diff
Patch8: coreutils-sysinfo.diff
Patch9: testsuite.diff
Patch10: frexpl.diff
Patch11: i18n-monthsort.diff
Patch12: i18n-random.diff
Patch16: invalid-ids.diff
@ -40,7 +43,6 @@ Patch20: coreutils-6.8-su.diff
Patch21: coreutils-6.8.0-pie.diff
Patch22: coreutils-5.3.0-sbin4su.diff
Patch23: coreutils-getaddrinfo.diff
Requires: %{name}-lang = %version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -103,6 +105,8 @@ Authors:
%patch6
%patch
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11
%patch12
%patch16 -p1
@ -113,16 +117,19 @@ Authors:
%build
AUTOPOINT=true autoreconf -fi
gl_cv_func_printf_directive_n=yes \
./configure CFLAGS="$RPM_OPT_FLAGS -Wall" \
--prefix=%{_prefix} --mandir=%{_mandir} \
--infodir=%{_infodir} --without-included-regex \
--enable-install-program=arch,su \
--enable-no-install-program=hostid \
gl_cv_func_printf_directive_n=yes \
gl_cv_func_isnanl_works=yes \
DEFAULT_POSIX2_VERSION=199209
make %{?jobs:-j%jobs} PAMLIBS="-lpam -ldl"
%check
if test $EUID -eq 0; then
su nobody -c make check
su nobody -c make check VERBOSE=yes
make check-root VERBOSE=yes
else
%ifarch %arm
@ -175,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%changelog
* Fri Apr 11 2008 schwab@suse.de
- Work around a recent glibc/getopt.c diagnostic change.
- Fix frexpl test.
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support

36
frexpl.diff Normal file
View File

@ -0,0 +1,36 @@
commit 5ac7a821bd96ca5e531d5127f66ab6a258cd7fcb
Author: Andreas Schwab <schwab@suse.de>
Date: Thu Jan 31 00:25:53 2008 +0100
Fix autoconf test bug introduced on 2008-01-15.
2008-01-30 Andreas Schwab <schwab@suse.de>
Bruno Haible <bruno@clisp.org>
* m4/frexpl.m4 (gl_FUNC_FREXPL_WORKS): Include <float.h> and ensure a
correct definition of LDBL_MIN_EXP.
diff --git a/m4/frexpl.m4 b/m4/frexpl.m4
index a4f2bd8..c6bdff6 100644
--- a/m4/frexpl.m4
+++ b/m4/frexpl.m4
@@ -1,4 +1,4 @@
-# frexpl.m4 serial 7
+# frexpl.m4 serial 8
dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -106,7 +106,13 @@ AC_DEFUN([gl_FUNC_FREXPL_WORKS],
AC_CACHE_CHECK([whether frexpl works], [gl_cv_func_frexpl_works],
[
AC_TRY_RUN([
+#include <float.h>
#include <math.h>
+/* Override the values of <float.h>, like done in float.in.h. */
+#if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
+# undef LDBL_MIN_EXP
+# define LDBL_MIN_EXP (-16381)
+#endif
extern long double frexpl (long double, int *);
int main()
{

22
testsuite.diff Normal file
View File

@ -0,0 +1,22 @@
commit 76576ba2f5e270bfb78e46604392d0258bbf6320
Author: Jim Meyering <meyering@redhat.com>
Date: Sat Mar 29 00:11:15 2008 +0100
Work around a recent glibc/getopt.c diagnostic change.
* tests/misc/factor: Map new "-- '1'" to expected "-- 1".
Signed-off-by: Jim Meyering <meyering@redhat.com>
diff --git a/tests/misc/factor b/tests/misc/factor
index a350ca9..de3f376 100755
--- a/tests/misc/factor
+++ b/tests/misc/factor
@@ -65,6 +65,7 @@ my @Tests =
['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}],
['y', '4294966998', {OUT => '2 3 7 3917 26107'}],
['z', '-1',
+ {ERR_SUBST => q!s/'1'/1/!}, # map newer glibc diagnostic to expected.
{ERR => "$prog: invalid option -- 1\n"
. "Try `$prog --help' for more information.\n"},
{EXIT => 1}],