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 91e9a1b8faf8bb2305917e201a1d740bbbf8f360..0000000000000000000000000000000000000000 --- 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-posix-2013-a.tar.xz b/man-pages-posix-2013-a.tar.xz deleted file mode 100644 index 02b6e5598d773cee00979c39b12218888c6252b5..0000000000000000000000000000000000000000 Binary files a/man-pages-posix-2013-a.tar.xz and /dev/null differ diff --git a/man-pages.spec b/man-pages.spec index b72871720911ecb3f45be7aa67a8c36b72839f3f..a11ed0607d67ec8bd6eda9c974b7c3311b1ae877 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,11 +1,10 @@ Name: man-pages Version: 5.02 -Release: 2 +Release: 3 Summary: Linux kernel and user-space C library interfaces documentation License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE URL: http://www.kernel.org/doc/man-pages/ Source0: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz -Source1: man-pages-posix-2013-a.tar.xz BuildRequires: gcc git BuildArch: noarch @@ -14,9 +13,6 @@ Conflicts: keyutils-libs < 1.5.10 Autoreq: no -# POSIX man pages -Patch0: man-pages-posix-2013-a-pthread_once.patch - %description The Linux man-pages project documents the Linux kernel and C library interface that are employed by user-space programs.With respect to the C library, the primary focus is @@ -26,18 +22,12 @@ other C libraries available for Linux is also included. %package_help %prep -%autosetup -a 1 -p1 - -# rename posix README so we don't have conflict -%{__mv} man-pages-posix-2013-a/README man-pages-posix-2013-a/man-pages-posix-2013-a.README +%autosetup -p1 %build %install make install DESTDIR=%{buildroot} -pushd man-pages-posix-2013-a -make install DESTDIR=%{buildroot} -popd %check @@ -52,7 +42,6 @@ popd %files %defattr(-,root,root) %doc README man-pages-%{version}.Announce Changes -%doc man-pages-posix-2013-a/POSIX-COPYRIGHT man-pages-posix-2013-a/man-pages-posix-2013-a.{README,Announce} %files help %{_mandir}/man*/* @@ -60,6 +49,9 @@ popd %exclude %{_mandir}/man7/bpf-helpers.7.gz %changelog +* Mon Jan 13 2020 openEuler Buildteam - 5.02-3 +- Delete useless files. + * Tue Sep 03 2019 openEuler Buildteam - 5.02-2 - remove conflictive man files