diff --git a/.gitignore b/.gitignore index 003f389..ad8e7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -/man-pages-posix-2013-a.tar.xz /man-pages-additional-20140218.tar.xz +/man-pages-posix-2013-a.tar.xz +/man-pages-posix-2017-a.tar.xz /man-pages-4.02.tar.xz /man-pages-4.03.tar.xz /man-pages-4.04.tar.xz diff --git a/man-pages-posix-2013-a-pthread_once.patch b/man-pages-posix-2013-a-pthread_once.patch deleted file mode 100644 index 91e9a1b..0000000 --- a/man-pages-posix-2013-a-pthread_once.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0409c3370ddd08cec10586f6f52fe1fbe3c717ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Tue, 24 Jan 2017 16:35:02 +0100 -Subject: [PATCH] pthread_once.3p: fix return type of initialize_random() - function - ---- - man-pages-posix-2013-a/man3p/pthread_once.3p | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man-pages-posix-2013-a/man3p/pthread_once.3p b/man-pages-posix-2013-a/man3p/pthread_once.3p -index 316b1e9..db83d63 100644 ---- a/man-pages-posix-2013-a/man3p/pthread_once.3p -+++ b/man-pages-posix-2013-a/man3p/pthread_once.3p -@@ -86,7 +86,7 @@ on entry to a routine, as follows: - .nf - \fB - static int random_is_initialized = 0; --extern int initialize_random(); -+extern void initialize_random(); - .P - int random_function() - { -@@ -125,7 +125,7 @@ becomes: - \fB - #include - static pthread_once_t random_is_initialized = PTHREAD_ONCE_INIT; --extern int initialize_random(); -+extern void initialize_random(); - .P - int random_function() - { --- -2.7.4 - diff --git a/man-pages.spec b/man-pages.spec index 5d2dbf8..2d506fd 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,18 +1,19 @@ -%global posix_version 2013 +%global posix_version 2017 %global posix_release a -%global posix_name man-pages-posix-%{posix_version}-%{posix_release} +%global posix_name man-pages-posix-%{posix_version} +%global posix_name_rel %{posix_name}-%{posix_release} %global additional_version 20140218 %global additional_name man-pages-additional-%{additional_version} Summary: Linux kernel and C library user-space interface documentation Name: man-pages Version: 5.07 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE URL: http://www.kernel.org/doc/man-pages/ Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz # POSIX man pages -Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/%{posix_name}.tar.xz +Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/%{posix_name_rel}.tar.xz # additional man-pages, the source tarball is fedora/rhel only Source2: %{additional_name}.tar.xz @@ -34,8 +35,6 @@ BuildArch: noarch ## Patches ## # POSIX man pages -# resolves: #1415757 -Patch0: man-pages-posix-2013-a-pthread_once.patch # Regular man pages # resolves: #650985 @@ -50,12 +49,11 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %prep %setup -q -a 1 -a 2 -%patch0 -p1 %patch21 -p1 %patch22 -p1 # rename posix README so we don't have conflict -mv %{posix_name}/README %{posix_name}/%{posix_name}.README +mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README ## Remove man pages we are not going to use ## @@ -113,11 +111,15 @@ fi %files %doc README man-pages-%{version}.Announce Changes -%doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name}.{README,Announce} +%doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name_rel}.{README,Announce} %ghost %{_mandir}/man7/man.7* %{_mandir}/man*/* %changelog +* Fri Nov 06 2020 Nikola Forró - 5.07-3 +- update POSIX man pages to 2017-a + resolves: #1691808 + * Tue Jul 28 2020 Fedora Release Engineering - 5.07-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 0eef484..72d3a08 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (man-pages-posix-2013-a.tar.xz) = e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 +SHA512 (man-pages-posix-2017-a.tar.xz) = dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d SHA512 (man-pages-5.07.tar.xz) = 701837b6a8dd3bf9e0fa3d0234384bcc8af4ba8b6a4fdce01a441a146c5101bb14b96cfd68b48613c2ddd2237d01c63fb24a8478c4fff5482265f6605bcbe2f5