Hello community,
here is the log from the commit of package coreutils
checked in at Thu Jun 22 18:22:22 CEST 2006.
--------
--- coreutils/coreutils.changes 2006-05-22 13:34:53.000000000 +0200
+++ coreutils/coreutils.changes 2006-06-22 18:10:05.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 22 15:38:27 CEST 2006 - schwab@suse.de
+
+- Fix conflict with .
+
+-------------------------------------------------------------------
New:
----
tee.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coreutils.spec ++++++
--- /var/tmp/diff_new_pack.Hh0M2h/_old 2006-06-22 18:22:11.000000000 +0200
+++ /var/tmp/diff_new_pack.Hh0M2h/_new 2006-06-22 18:22:11.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
PreReq: %{install_info_prereq}
Version: 5.96
-Release: 1
+Release: 2
Summary: GNU Core Utilities
Source: coreutils-%{version}.tar.bz2
Source1: su.pamd
@@ -37,6 +37,7 @@
Patch6: i18n-infloop.diff
Patch7: coreutils-5.0-pam-env.patch
Patch8: coreutils-sysinfo.diff
+Patch9: tee.diff
Patch16: invalid-ids.diff
Patch17: no-no.diff
Patch20: coreutils-5.3.0-pie.diff
@@ -105,6 +106,7 @@
%patch
%patch7 -p1
%patch8 -p1
+%patch9
%patch16 -p1
%patch17
%patch20
@@ -121,9 +123,7 @@
DEFAULT_POSIX2_VERSION=199209 \
--prefix=%{_prefix} --mandir=%{_mandir} \
--infodir=%{_infodir} --without-included-regex
-make PAMLIBS="-lpam -ldl" %{?jobs:-j%jobs}
-# rebuild German translation file (see patch22)
-[ -x /usr/bin/msgfmt ] && make -C po de.gmo
+make %{?jobs:-j%jobs} PAMLIBS="-lpam -ldl"
if test $EUID -eq 0; then
su nobody -c make check
make check-root VERBOSE=yes
@@ -140,13 +140,12 @@
test -f $RPM_BUILD_ROOT%{_bindir}/su || \
install src/su $RPM_BUILD_ROOT%{_bindir}/su
install -d $RPM_BUILD_ROOT/bin
-rm -f bin.files
for i in basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mv pwd rm rmdir sleep sort stty su sync touch true uname
do
mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT/bin/$i
- test $i = su && echo '%%attr(4755,root,root)' >> bin.files
- echo /bin/$i >> bin.files
-done
+ test $i = su && echo -n '%%attr(4755,root,root) '
+ echo /bin/$i
+done > bin.files
ln -sf ../../bin/basename ../../bin/sort ../../bin/touch $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d
install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su
@@ -158,7 +157,7 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/hostname
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/hostid.1
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/hostname.1
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/locale/*/LC_TIME/coreutils.mo
+rm -f $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_TIME/coreutils.mo
%post
%install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
@@ -181,6 +180,8 @@
%doc %{_mandir}/man1/*.1.gz
%changelog -n coreutils
+* Thu Jun 22 2006 - schwab@suse.de
+- Fix conflict with .
* Mon May 22 2006 - schwab@suse.de
- Update to coreutils 5.96 (bug fixes).
* Sat May 13 2006 - schwab@suse.de
++++++ tee.diff ++++++
2006-06-22 Jim Meyering
* src/tee.c (tee_files): Rename from tee, to avoid conflict with
the function in glibc's . Reported by Andreas Schwab.
Index: src/tee.c
===================================================================
RCS file: /sources/coreutils/coreutils/src/tee.c,v
retrieving revision 1.83
retrieving revision 1.83.2.1
diff -u -a -p -r1.83 -r1.83.2.1
--- src/tee.c 11 Jul 2005 18:26:52 -0000 1.83
+++ src/tee.c 22 Jun 2006 12:52:37 -0000 1.83.2.1
@@ -1,5 +1,5 @@
/* tee - read from standard input and write to standard output and files.
- Copyright (C) 85,1990-2005 Free Software Foundation, Inc.
+ Copyright (C) 85,1990-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
#define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie"
-static bool tee (int nfiles, const char **files);
+static bool tee_files (int nfiles, const char **files);
/* If true, append to output files rather than truncating them. */
static bool append;
@@ -121,7 +121,7 @@ main (int argc, char **argv)
/* Do *not* warn if tee is given no file arguments.
POSIX requires that it work when given no arguments. */
- ok = tee (argc - optind, (const char **) &argv[optind]);
+ ok = tee_files (argc - optind, (const char **) &argv[optind]);
if (close (STDIN_FILENO) != 0)
error (EXIT_FAILURE, errno, _("standard input"));
@@ -133,7 +133,7 @@ main (int argc, char **argv)
Return true if successful. */
static bool
-tee (int nfiles, const char **files)
+tee_files (int nfiles, const char **files)
{
FILE **descriptors;
char buffer[BUFSIZ];
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org