diff --git a/man-pages.spec b/man-pages.spec index 496383a..119d0d4 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,21 +1,15 @@ -%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: 5.13 -Release: 3%{?dist} -License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE +Release: 4%{?dist} +License: GPL+ and GPLv2+ and BSD and MIT and Copyright only 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 @@ -35,8 +29,6 @@ BuildArch: noarch ## Patches ## -# POSIX man pages - # Regular man pages # resolves: #650985 # https://bugzilla.kernel.org/show_bug.cgi?id=53781 @@ -46,13 +38,10 @@ Patch21: man-pages-3.42-close.patch A large collection of manual pages from the Linux Documentation Project (LDP). %prep -%setup -q -a 1 -a 2 +%setup -q -a 1 %patch21 -p1 -# 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 @@ -64,9 +53,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 @@ -75,9 +61,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 @@ -109,11 +92,14 @@ fi %files %doc README man-pages-%{version}.Announce Changes -%doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name_rel}.{README,Announce} %ghost %{_mandir}/man7/man.7* %{_mandir}/man*/* %changelog +* Tue Aug 09 2022 Nikola Forró - 5.13-4 +- Remove POSIX man pages due to disallowed license + resolves: #2116859 + * Thu Jul 21 2022 Fedora Release Engineering - 5.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 02b2909..6ff8815 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-5.13.tar.xz) = a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499