diff --git a/coreutils-df-direct.patch b/coreutils-df-direct.patch index 66698bd..025323d 100644 --- a/coreutils-df-direct.patch +++ b/coreutils-df-direct.patch @@ -52,7 +52,7 @@ diff -urNp coreutils-8.11-orig/src/df.c coreutils-8.11/src/df.c - char const *header = _(headers[field][header_mode]); + + char const *header = (field == MNT_FIELD && direct_statfs)? -+ _("File\n") : ++ _("File") : + _(headers[field][header_mode]); + if (!header) @@ -157,14 +157,14 @@ diff -urNp coreutils-8.11-orig/tests/df/direct coreutils-8.11/tests/df/direct +compare header_file_out header_file_exp || fail=1 + +# check df output (without --direct) -+#$AWK '{ if (NR==2) print $6; }' df_out > file_out \ -+# || framework_failure -+#compare file_out file_exp && fail=1 ++$AWK '{ if (NR==2) print $6; }' df_out > file_out \ ++ || framework_failure ++compare file_out file_exp && fail=1 + +# check df output (with --direct) -+#$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \ -+# || framework_failure -+#compare file_out file_exp || fail=1 ++$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \ ++ || framework_failure ++compare file_out file_exp || fail=1 + +Exit $fail diff -urNp coreutils-8.11-orig/tests/Makefile.am coreutils-8.11/tests/Makefile.am diff --git a/coreutils.spec b/coreutils.spec index 025a772..056ad3b 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -332,6 +332,9 @@ fi %{_libdir}/coreutils %changelog +* Thu Apr 14 2011 Ondrej Vasik - 8.11-2 +- fix issue with df --direct(extra new line) + * Thu Apr 14 2011 Ondrej Vasik - 8.11-1 - new upstream release 8.11, defuzz patches