merge coreutils-selinuxmanpages.patch into coreutils-selinux.patch

It does not make any sense to apply them separately.

coreutils-selinux.patch

@@ -60,19 +60,22 @@ index 1b528c6..25dbb88 100644
          case 'd':
            x.preserve_links = true;
            x.dereference = DEREF_NEVER;
-diff --git a/src/id.c b/src/id.c
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 05d98a5..d6eb002 100644
+index 47e4480..cff2ead 100644
---- a/src/id.c
+--- a/doc/coreutils.texi
-+++ b/src/id.c
++++ b/doc/coreutils.texi
-@@ -114,7 +114,7 @@ int
+@@ -8083,6 +8083,11 @@ done
- main (int argc, char **argv)
+ exit $fail
- {
+ @end example
-   int optc;
+ 
--  int selinux_enabled = (is_selinux_enabled () > 0);
++@item -c
-+  bool selinux_enabled = (is_selinux_enabled () > 0);
++@cindex SELinux security context information, preserving
-   bool smack_enabled = is_smack_enabled ();
++Preserve SELinux security context of the original files if possible.
-   bool opt_zero = false;
++Some file systems don't support storing of SELinux security context.
-   char *pw_name = NULL;
++
+ @item --copy-contents
+ @cindex directories, copying recursively
+ @cindex copying directories recursively
 diff --git a/src/install.c b/src/install.c
 index d79d597..437889a 100644
 --- a/src/install.c

coreutils-selinuxmanpages.patch

@@ -1,16 +0,0 @@
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index 47e4480..cff2ead 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -8083,6 +8083,11 @@ done
- exit $fail
- @end example
- 
-+@item -c
-+@cindex SELinux security context information, preserving
-+Preserve SELinux security context of the original files if possible.
-+Some file systems don't support storing of SELinux security context.
-+
- @item --copy-contents
- @cindex directories, copying recursively
- @cindex copying directories recursively

coreutils.spec

@@ -58,7 +58,6 @@ Patch912: coreutils-overflow.patch
 #SELINUX Patch - implements Redhat changes
 #(upstream did some SELinux implementation unlike with RedHat patch)
 Patch950: coreutils-selinux.patch
-Patch951: coreutils-selinuxmanpages.patch
 
 Conflicts: filesystem < 3
 # To avoid clobbering installs