[man-pages] - resolves: #820901 update to 3.41

pschiffe pschiffe at fedoraproject.org
Thu May 17 14:54:19 UTC 2012


commit 6fe2804b5714b60c1d266be905b539d9fd0e954f
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu May 17 16:53:20 2012 +0200

    - resolves: #820901
      update to 3.41

 .gitignore                        |    2 +-
 man-pages-2.48-passwd.patch       |   19 ---------------
 man-pages-3.23-proc.patch         |   14 -----------
 man-pages-3.23-proc_cgroups.patch |   45 -------------------------------------
 man-pages-3.24-mmap64.patch       |    6 -----
 man-pages-3.27-sd.patch           |   12 ----------
 man-pages.spec                    |   26 +++++++++------------
 sources                           |    2 +-
 8 files changed, 13 insertions(+), 113 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af4b15b..5a23b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /man-pages-posix-2003-a.tar.bz2
 /man-pages-additional-20101006.tar.bz2
-/man-pages-3.40.tar.gz
+/man-pages-3.41.tar.xz
diff --git a/man-pages.spec b/man-pages.spec
index 9fd4768..de0731b 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -3,12 +3,12 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.40
-Release: 2%{?dist}
+Version: 3.41
+Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://man7.org/linux/man-pages/
-Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.gz
+Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.xz
 # POSIX man pages
 Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.bz2
 # additional man-pages, the source tarball is fedora only
@@ -16,21 +16,20 @@ Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-page
 Source2: man-pages-additional-20101006.tar.bz2
 Patch28: man-pages-2.46-nscd.patch
 Patch36: man-pages-2.63-unimplemented.patch
-Patch45: man-pages-2.48-passwd.patch
 Patch46: man-pages-2.51-nscd-conf.patch
+# Declined by upstream
 Patch53: man-pages-2.78-stream.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
-Patch58: man-pages-3.23-proc.patch
 Patch59: man-pages-3.23-ld.so.patch
 Patch60: man-pages-3.22-sched_setaffinity.patch
+# Declined by upstream
 Patch63: man-pages-3.24-getnameinfo.patch
-Patch67: man-pages-3.24-mmap64.patch
-Patch69: man-pages-3.27-sd.patch
+# Declined by upstream
 Patch70: man-pages-3.29-uri.patch
 Patch71: man-pages-posix-2003-awk.patch
 Patch72: man-pages-posix-2003-man.patch
 Patch73: man-pages-posix-2003-printf.patch
-#Resolves: #647269
+#Resolves: #647269, # Declined by upstream
 Patch75: man-pages-3.30-prctl.patch
 #Resolves: #652870
 Patch76: man-pages-3.32-strtol.patch
@@ -44,8 +43,6 @@ Patch79: man-pages-3.32-spellch.patch
 Patch80: man-pages-3.35-printf.patch
 #resolves: #698149
 Patch82: man-pages-3.32-host.patch
-#resolves: #705888 
-Patch83: man-pages-3.23-proc_cgroups.patch
 #resolves: #723578
 Patch84: man-pages-3.35-readlink3p.patch
 #Resolves: #655961
@@ -66,16 +63,12 @@ mv man-pages-posix-%{posix_version}-%{posix_release}/* ./
 rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch28 -p1
 %patch36 -p1
-%patch45 -p1
 %patch46 -p1
 %patch53 -p1
 %patch57 -p1
-%patch58 -p1
 %patch59 -p1
 %patch60 -p1
 %patch63 -p1
-%patch67 -p1
-%patch69 -p1
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
@@ -87,7 +80,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch79 -p1
 %patch80 -p1
 %patch82 -p1
-%patch83 -p1
 %patch84 -p1
 
 ### And now remove those we are not going to use:
@@ -144,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Thu May 17 2012 Peter Schiffer <pschiffe at redhat.com> - 3.41-1
+- resolves: #820901
+  update to 3.41
+
 * Fri Apr 27 2012 Peter Schiffer <pschiffe at redhat.com> - 3.40-2
 - related: #797857
   fixed broken source file
diff --git a/sources b/sources
index efd938f..95e626d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
 6cea268fa2debf9b6440ee5c37cd4bc8  man-pages-additional-20101006.tar.bz2
-41f40b4890c2f463840ed7070e68ab3a  man-pages-3.40.tar.gz
+7395d284fa1b9e112006d736865781b0  man-pages-3.41.tar.xz


More information about the scm-commits mailing list