From 3716dd839293cdeb5514129655af99c8119c2162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 8 Aug 2018 12:31:00 +0200 Subject: [PATCH] Move *.3 manpages to devel subpackage (#1613762) Add needed Conflicts: man-pages < 4.15-3 --- libxcrypt.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libxcrypt.spec b/libxcrypt.spec index 037c94c..38d0c11 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -19,7 +19,7 @@ Name: libxcrypt Version: 4.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extended crypt library for DES, MD5, Blowfish and others # For explicit license breakdown, see the @@ -85,6 +85,8 @@ legacy APIs supplied by glibc's libcrypt ('encrypt', 'encrypt_r', %package devel Summary: Development files for %{name} +Conflicts: man-pages < 4.15-3 + Requires: %{name}%{?_isa} == %{version}-%{release} Requires: glibc-devel%{?_isa} >= 2.26.9000-46 Requires: glibc-headers%{?_isa} >= 2.26.9000-46 @@ -159,11 +161,6 @@ is highly discouraged. /%{_lib}/.libcrypt.so.%{sov}.hmac /%{_lib}/libcrypt.so.%{soc} /%{_lib}/libcrypt.so.%{sov} -%{_mandir}/man3/crypt.3.* -%{_mandir}/man3/crypt_r.3.* -%{_mandir}/man3/crypt_ra.3.* -%{_mandir}/man3/crypt_rn.3.* -%{_mandir}/man3/crypt_gensalt.3.* %{_mandir}/man5/crypt.5.* @@ -174,6 +171,11 @@ is highly discouraged. %{_includedir}/crypt.h %{_libdir}/pkgconfig/libcrypt.pc %{_libdir}/pkgconfig/%{name}.pc +%{_mandir}/man3/crypt.3.* +%{_mandir}/man3/crypt_r.3.* +%{_mandir}/man3/crypt_ra.3.* +%{_mandir}/man3/crypt_rn.3.* +%{_mandir}/man3/crypt_gensalt.3.* %files static @@ -181,6 +183,10 @@ is highly discouraged. %changelog +* Wed Aug 08 2018 Björn Esser - 4.1.1-4 +- Move *.3 manpages to devel subpackage (#1613762) +- Add needed Conflicts: man-pages < 4.15-3 + * Wed Aug 08 2018 Björn Esser - 4.1.1-3 - Make crypt{,_r} return NULL on failure (#1611784)