[packages/heimdal] - resolve more man pages conflicts with openssl 1.1

adwol adwol at pld-linux.org
Tue Aug 21 22:41:17 CEST 2018


commit c31728a89486796a3f4b698c7c05b5479670b7f6
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Tue Aug 21 22:40:17 2018 +0200

    - resolve more man pages conflicts with openssl 1.1

 heimdal.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/heimdal.spec b/heimdal.spec
index 7e6fe06..6c0d8b9 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -333,7 +333,7 @@ install -p lib/krb5/kcm.h $RPM_BUILD_ROOT%{_includedir}/kcm
 %{__mv} $RPM_BUILD_ROOT%{_mandir}/man5/{krb5.conf.5,krb5.conf.5h}
 
 # resolve conflict with openssl 1.1
-for m in $RPM_BUILD_ROOT%{_mandir}/man3/DES_*.3 ; do
+for m in $RPM_BUILD_ROOT%{_mandir}/man3/{DES,DH,EVP,PKCS5,RAND,RSA}_*.3 ; do
 	man=$(basename "$m")
 	%{__mv} "$m" "$RPM_BUILD_ROOT%{_mandir}/man3/hc_$man"
 done
@@ -597,15 +597,15 @@ fi
 %{_pkgconfigdir}/krb5-gssapi.pc
 %{_mandir}/man1/krb5-config.1*
 %{_mandir}/man3/hc_DES_*.3*
-%{_mandir}/man3/DH_*.3*
-%{_mandir}/man3/EVP_*.3*
+%{_mandir}/man3/hc_DH_*.3*
+%{_mandir}/man3/hc_EVP_*.3*
 %{_mandir}/man3/HDB.3*
 %{_mandir}/man3/OSSL_CIPHER_ALGORITHM.3*
 %{_mandir}/man3/OpenSSL_add_all_algorithms*.3*
-%{_mandir}/man3/PKCS5_PBKDF2_HMAC.3*
-%{_mandir}/man3/PKCS5_PBKDF2_HMAC_SHA1.3*
-%{_mandir}/man3/RAND_*.3*
-%{_mandir}/man3/RSA_*.3*
+%{_mandir}/man3/hc_PKCS5_PBKDF2_HMAC.3*
+%{_mandir}/man3/hc_PKCS5_PBKDF2_HMAC_SHA1.3*
+%{_mandir}/man3/hc_RAND_*.3*
+%{_mandir}/man3/hc_RSA_*.3*
 %{_mandir}/man3/WINCNG_CIPHER_ALGORITHM.3*
 %{_mandir}/man3/WINCNG_CIPHER_ALGORITHM_UNAVAILABLE.3*
 %{_mandir}/man3/data.3*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/c31728a89486796a3f4b698c7c05b5479670b7f6



More information about the pld-cvs-commit mailing list