[man-pages] - removed man-pages-3.42-nsswitch-conf-sssd.patch because this change doesn't belong to the nsswitch

[pschiffe]

commit c1938306dce142a3c4543c4da99e24ca7c2ce177
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu Sep 13 18:43:07 2012 +0200

    - removed man-pages-3.42-nsswitch-conf-sssd.patch because this change doesn't belong to the nsswitch.conf(5) man page and updated 2 patches

 man-pages-2.46-nscd.patch               |    7 ++++---
 man-pages-3.22-nsswitch.conf.patch      |    8 ++++----
 man-pages-3.42-nsswitch-conf-sssd.patch |   14 --------------
 man-pages.spec                          |   30 +++++++++++++-----------------
 4 files changed, 21 insertions(+), 38 deletions(-)
---
diff --git a/man-pages-2.46-nscd.patch b/man-pages-2.46-nscd.patch
index 2aca94b..05ebfb3 100644
--- a/man-pages-2.46-nscd.patch
+++ b/man-pages-2.46-nscd.patch
@@ -1,6 +1,7 @@
---- man-pages-2.46/man8/nscd.8.pom	2007-04-30 10:24:21.000000000 +0200
-+++ man-pages-2.46/man8/nscd.8	2007-04-30 10:57:49.000000000 +0200
-@@ -47,6 +47,8 @@
+diff -ur man-pages-3.42.orig/man8/nscd.8 man-pages-3.42/man8/nscd.8
+--- man-pages-3.42.orig/man8/nscd.8	2012-08-14 00:39:40.000000000 +0200
++++ man-pages-3.42/man8/nscd.8	2012-09-13 18:27:57.579018903 +0200
+@@ -53,6 +53,8 @@
  Note that the shadow file is specifically not cached.
  .BR getspnam (3)
  calls remain uncached as a result.
diff --git a/man-pages-3.22-nsswitch.conf.patch b/man-pages-3.22-nsswitch.conf.patch
index 8fa408b..cd73945 100644
--- a/man-pages-3.22-nsswitch.conf.patch
+++ b/man-pages-3.22-nsswitch.conf.patch
@@ -1,7 +1,7 @@
-diff -up man-pages-3.40/man5/nsswitch.conf.5.orig man-pages-3.40/man5/nsswitch.conf.5
---- man-pages-3.40/man5/nsswitch.conf.5.orig	2012-04-27 00:58:39.000000000 +0200
-+++ man-pages-3.40/man5/nsswitch.conf.5	2012-04-27 14:25:22.453203872 +0200
-@@ -46,6 +46,11 @@ The following databases are understood b
+diff -ur man-pages-3.42.orig/man5/nsswitch.conf.5 man-pages-3.42/man5/nsswitch.conf.5
+--- man-pages-3.42.orig/man5/nsswitch.conf.5	2012-08-14 00:39:40.000000000 +0200
++++ man-pages-3.42/man5/nsswitch.conf.5	2012-09-13 18:22:52.679702505 +0200
+@@ -45,6 +45,11 @@
  Mail aliases, used by
  .BR getaliasent (3)
  and related functions.
diff --git a/man-pages.spec b/man-pages.spec
index 6efd1f3..cfe4ec1 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -34,31 +34,29 @@ Patch40: man-pages-2.46-nscd.patch
 # resolves: #522761
 Patch41: man-pages-3.22-nsswitch.conf.patch
 # resolves: #532629
-Patch43: man-pages-3.23-ld.so.patch
+Patch42: man-pages-3.23-ld.so.patch
 # resolves: #698149
-Patch44: man-pages-3.32-host.patch
+Patch43: man-pages-3.32-host.patch
 # resolves: #652870
-Patch45: man-pages-3.32-strtol.patch
+Patch44: man-pages-3.32-strtol.patch
 # resolves: #681781
-Patch46: man-pages-3.35-printf.patch
+Patch45: man-pages-3.35-printf.patch
 # resolves: #566303, #835679, #840805
-Patch47: man-pages-3.42-nscd-conf.patch
+Patch46: man-pages-3.42-nscd-conf.patch
 # resolves: #837090
-Patch48: man-pages-3.42-inet.patch
+Patch47: man-pages-3.42-inet.patch
 # resolves: #751429, #786684
-Patch49: man-pages-3.42-nsswitch-conf.patch
+Patch48: man-pages-3.42-nsswitch-conf.patch
 # resolves: #717770
-Patch50: man-pages-3.42-resolv-conf.patch
+Patch49: man-pages-3.42-resolv-conf.patch
 # resolves: #800256
-Patch51: man-pages-3.42-shmop.patch
+Patch50: man-pages-3.42-shmop.patch
 # resolves: #804003
-Patch52: man-pages-3.42-ip.patch
+Patch51: man-pages-3.42-ip.patch
 # resolves: #787567
-Patch53: man-pages-3.42-ip-local-port.patch
-# resolves: #694860
-Patch54: man-pages-3.42-nsswitch-conf-sssd.patch
+Patch52: man-pages-3.42-ip-local-port.patch
 # resolves: #809490
-Patch55: man-pages-3.42-getdents.patch
+Patch53: man-pages-3.42-getdents.patch
 
 
 Autoreq: false
@@ -82,6 +80,7 @@ Documentation Project (LDP).
 
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 %patch43 -p1
 %patch44 -p1
 %patch45 -p1
@@ -93,8 +92,6 @@ Documentation Project (LDP).
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
-%patch54 -p1
-%patch55 -p1
 
 ## Remove man pages we are not going to use ##
 
@@ -171,7 +168,6 @@ cd ..
 - add missing EIDRM error code description to the shmop(2) man page (#800256)
 - add documentation of several source-specific multicast socket options to the ip(7) man page (#804003)
 - improved explanation about calling listen or connect on the ip(7) man page (#787567)
-- mention sssd in the nsswitch.conf(5) man page (#694860)
 - added information about incorrect use of getdents(2) call to the man page (#809490)
 - removed man-pages-3.22-sched_setaffinity.patch because the problem it describes was fixed in the kernel. see #533811 for more info