diff --git a/coreutils-6.10-configuration.patch b/coreutils-6.10-configuration.patch index 6bbe3a0..2fbd3e8 100644 --- a/coreutils-6.10-configuration.patch +++ b/coreutils-6.10-configuration.patch @@ -79,20 +79,6 @@ diff -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am tail-2/inotify-hash-abuse2 \ tail-2/F-vs-rename \ tail-2/inotify-rotate \ -diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh ---- coreutils-8.4-orig/tests/test-lib.sh 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/tests/test-lib.sh 2010-01-14 10:28:17.000000000 +0100 -@@ -218,8 +218,8 @@ skip_if_() - - require_selinux_() - { -- case `ls -Zd .` in -- '? .'|'unlabeled .') -+ case `ls --scontext -d . | cut -f1 -d" "` in -+ '?'|'unlabeled') - skip_test_ "this system (or maybe just" \ - "the current file system) lacks SELinux support" - ;; diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference --- coreutils-8.4-orig/tests/touch/no-dereference 2010-01-12 15:36:17.000000000 +0100 +++ coreutils-8.4/tests/touch/no-dereference 2010-01-14 10:28:17.000000000 +0100 diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index 388f75c..26cd0dc 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -794,6 +794,20 @@ diff -urNp coreutils-8.1-orig/src/stat.c coreutils-8.1/src/stat.c exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); } +diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh +--- coreutils-8.4-orig/tests/test-lib.sh 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/tests/test-lib.sh 2010-01-14 10:28:17.000000000 +0100 +@@ -218,8 +218,8 @@ skip_if_() + + require_selinux_() + { +- case `ls -Zd .` in +- '? .'|'unlabeled .') ++ case `ls -Zd . | cut -f4 -d" "` in ++ '?'|'unlabeled') + skip_test_ "this system (or maybe just" \ + "the current file system) lacks SELinux support" + ;; diff -urNp coreutils-8.1-orig/tests/misc/selinux coreutils-8.1/tests/misc/selinux --- coreutils-8.1-orig/tests/misc/selinux 2009-10-30 12:51:07.000000000 +0100 +++ coreutils-8.1/tests/misc/selinux 2009-11-20 13:11:40.000000000 +0100 diff --git a/coreutils.spec b/coreutils.spec index 3384e04..0b50783 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.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -337,6 +337,10 @@ fi %{_libdir}/coreutils %changelog +- Fri Feb 05 2010 Ondrej Vasik - 8.4-4 +- do not depend on selinux patch application in + _require_selinux tests(#556350) + * Fri Jan 29 2010 Ondrej Vasik - 8.4-3 - do not fail tests if there are no loopdevices left (#558898)