From 4aff53bbb86ca4f9571de44fd904ed773c4174ec Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Tue, 2 Mar 2010 09:25:28 +0000
Subject: [PATCH] - update to 3.24 Resolves: #569451

---
 .cvsignore                  |  2 +-
 man-pages-3.22-strcpy.patch | 12 ------------
 man-pages-3.23-ld.so.patch  | 14 ++++++--------
 man-pages.spec              | 12 +++++++-----
 sources                     |  2 +-
 5 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 man-pages-3.22-strcpy.patch

diff --git a/.cvsignore b/.cvsignore
index 673ad38..b92112f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,5 +2,5 @@ man-pages-extralocale.tar.bz2
 man-suid-bins.tar.bz2
 man-pages-posix-2003-a.tar.bz2
 man-pages_add-02.tar.bz2
-man-pages-3.23.tar.bz2
 man-pages_syscalls-03.tar.bz2
+man-pages-3.24.tar.bz2
diff --git a/man-pages-3.22-strcpy.patch b/man-pages-3.22-strcpy.patch
deleted file mode 100644
index a192dd1..0000000
--- a/man-pages-3.22-strcpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up man-pages-3.22/man3/strcpy.3.pom man-pages-3.22/man3/strcpy.3
---- man-pages-3.22/man3/strcpy.3.pom	2009-07-25 08:53:39.000000000 +0200
-+++ man-pages-3.22/man3/strcpy.3	2009-09-14 10:53:54.000000000 +0200
-@@ -137,7 +137,7 @@ in ways that may make the impossible pos
- .BR memcpy (3),
- .BR memmove (3),
- .BR strdup (3),
--.BR strpcpy (3),
-+.BR stpcpy (3),
- .BR wcscpy (3),
- .BR wcsncpy (3)
- .SH COLOPHON
diff --git a/man-pages-3.23-ld.so.patch b/man-pages-3.23-ld.so.patch
index 1b56c93..37fe58b 100644
--- a/man-pages-3.23-ld.so.patch
+++ b/man-pages-3.23-ld.so.patch
@@ -1,12 +1,10 @@
-diff -up man-pages-3.23/man8/ld.so.8.pom man-pages-3.23/man8/ld.so.8
---- man-pages-3.23/man8/ld.so.8.pom	2009-09-30 03:36:59.000000000 +0200
-+++ man-pages-3.23/man8/ld.so.8	2009-11-18 13:19:44.000000000 +0100
-@@ -323,13 +323,9 @@ This variable is ignored by set-user-ID 
- (glibc since 2.1)
- If set to a non-empty string,
+diff -up man-pages-3.24/man3/strcpy.3.pom man-pages-3.24/man3/strcpy.3
+diff -up man-pages-3.24/man8/ld.so.8.pom man-pages-3.24/man8/ld.so.8
+--- man-pages-3.24/man8/ld.so.8.pom	2010-02-26 05:46:55.000000000 +0100
++++ man-pages-3.24/man8/ld.so.8	2010-03-02 10:17:34.000000000 +0100
+@@ -325,11 +325,7 @@ If set to a nonempty string,
  output symbol versioning information about the
--program if querying information about the program (i.e., either
-+program if 
+ program if querying information about the program (i.e., either
  .B LD_TRACE_LOADED_OBJECTS
 -has been set, or
 -.B \-\-list
diff --git a/man-pages.spec b/man-pages.spec
index c3ee4e1..68d13a2 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -3,8 +3,8 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.23
-Release: 7%{?dist}
+Version: 3.24
+Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -27,7 +27,6 @@ Patch50: man-pages-2.63-iconv.patch
 Patch53: man-pages-2.78-stream.patch
 Patch54: man-pages-2.80-malloc_h.patch
 Patch55: man-pages-3.22-gai.conf.patch
-Patch56: man-pages-3.22-strcpy.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
 Patch58: man-pages-3.23-proc.patch
 Patch59: man-pages-3.23-ld.so.patch
@@ -59,7 +58,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
-%patch56 -p1
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
@@ -133,9 +131,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc README man-pages-%{version}.Announce POSIX-COPYRIGHT
 %{_mandir}/man*/*
-%lang(en) %{_mandir}/en/man*
+%lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Tue Mar  2 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.24-1
+- update to 3.24
+  Resolves: #569451
+
 * Mon Feb 22 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.23-7
 - Resolves: #564528
   Man page and "info" information on snprintf incomplete
diff --git a/sources b/sources
index 28cf2d8..9a9011d 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-153704ffa27160d708e0e8c56c1da58f  man-pages-3.23.tar.bz2
 4a222811a5589cf6d80cb0b4e1789fe8  man-pages_add-02.tar.bz2
 bf80e51c1db4fdf6d0ee21e2f9c49485  man-pages_syscalls-03.tar.bz2
+aca98183e51772ce81e17c78a46bea5d  man-pages-3.24.tar.bz2