From f7a7f43d841b84783c3d70323e4f4ea5759f1d88 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 29 Jul 2025 15:42:01 -0400 Subject: [PATCH] Remove POSIX man-pages to comply with licensing guidelines. Resolves: RHEL-101595 --- .gitignore | 30 +----------------------------- man-pages.spec | 28 +++++++--------------------- sources | 1 - 3 files changed, 8 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 815b013..9452199 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1 @@ -/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 -/man-pages-4.05.tar.xz -/man-pages-4.06.tar.xz -/man-pages-4.07.tar.xz -/man-pages-4.08.tar.xz -/man-pages-4.09.tar.xz -/man-pages-4.10.tar.xz -/man-pages-4.11.tar.xz -/man-pages-4.12.tar.xz -/man-pages-4.13.tar.xz -/man-pages-4.14.tar.xz -/man-pages-4.15.tar.xz -/man-pages-4.16.tar.xz -/man-pages-5.00.tar.xz -/man-pages-5.01.tar.xz -/man-pages-5.02.tar.xz -/man-pages-5.03.tar.xz -/man-pages-5.04.tar.xz -/man-pages-5.06.tar.xz -/man-pages-5.07.tar.xz -/man-pages-5.08.tar.xz -/man-pages-5.09.tar.xz -/man-pages-5.10.tar.xz -/man-pages-6.04.tar.xz +/*.tar.xz diff --git a/man-pages.spec b/man-pages.spec index d2e2060..4819a6b 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,14 +1,10 @@ -%global posix_version 2017 -%global posix_release a -%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: 6.04 -Release: 5%{?dist} +Release: 6%{?dist} # List of licenses with examples of man-pages using them # BSD-2-Clause: man-pages/man5/elf.5 # BSD-3-Clause: man-pages/man3/list.3 @@ -28,10 +24,8 @@ Release: 5%{?dist} License: BSD-2-Clause AND BSD-3-Clause AND BSD-4.3TAHOE AND BSD-4-Clause-UC AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Fedora-UltraPermissive AND Linux-man-pages-1-para AND Linux-man-pages-copyleft AND Linux-man-pages-copyleft-2-para AND Linux-man-pages-copyleft-var AND MIT AND Spencer-94 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_rel}.tar.xz # additional man-pages, the source tarball is fedora/rhel only -Source2: %{additional_name}.tar.xz +Source1: %{additional_name}.tar.xz BuildRequires: make Requires(post): %{_sbindir}/update-alternatives @@ -51,8 +45,6 @@ BuildArch: noarch ## Patches ## -# POSIX man pages - # Regular man pages # resolves: #650985 # https://bugzilla.kernel.org/show_bug.cgi?id=53781 @@ -76,7 +68,7 @@ Patch27: 0000-sched.7-Clarifications-corrections.patch A large collection of manual pages from the Linux Documentation Project (LDP). %prep -%setup -q -a 1 -a 2 +%setup -q -a 1 %patch -p1 -P 21 %patch -p1 -P 22 @@ -86,9 +78,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %patch -p1 -P 26 %patch -p1 -P 27 -# rename posix README so we don't have conflict -mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README - ## Remove man pages we are not going to use ## # deprecated @@ -100,9 +89,6 @@ rm man3/{db,btree,dbopen,hash,mpool,recno}.3 # we are not using SystemV anymore rm man7/boot.7 -# we do not have sccs (#203302) -rm %{posix_name}/man1p/{admin,delta,get,prs,rmdel,sact,sccs,unget,val,what}.1p - # remove man pages deprecated by libxcrypt (#1610307) rm man3/crypt{,_r}.3 @@ -111,9 +97,6 @@ rm man3/crypt{,_r}.3 %install make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT -pushd %{posix_name} -make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT -popd pushd %{additional_name} make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT popd @@ -145,11 +128,14 @@ fi %files %doc README Changes -%doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name_rel}.{README,Announce} %ghost %{_mandir}/man7/man.7* %{_mandir}/man*/* %changelog +* Fri Jul 25 2025 Patsy Griffin - 6.04-6 +- Remove POSIX man-pages to comply with licensing guidelines. + Resolves: RHEL-101595 + * Fri Jul 11 2025 Patsy Griffin - 6.04-5 - sched(7): Mention autogroup disabled behavior. Resolves: RHEL-67690 diff --git a/sources b/sources index 37d83e7..49e95e2 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (man-pages-posix-2017-a.tar.xz) = dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d SHA512 (man-pages-6.04.tar.xz) = 3f95d15dda419e824f902947a268d8021e9e04c5ba8503e4fe9f96a9ab8363fde8088b2712cc9c795638163ad8432bc5f8c6a3ea320293ec6aa79bb748e85b9e