[packages/openssl/v1.1.1] - enhanced engines-dir patch to adjust enginesdir in libcrypto.pc file, moved engines dir to base; r
qboosh
qboosh at pld-linux.org
Sun Jul 10 16:38:30 CEST 2022
commit ea23699e80f22aab0b8a72ae4b9b8c3011df3aab
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 10 16:40:11 2022 +0200
- enhanced engines-dir patch to adjust enginesdir in libcrypto.pc file, moved engines dir to base; release 2
engines-dir.patch | 9 +++++++++
openssl.spec | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 4092cdb..1d5c9ba 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -18,7 +18,7 @@ Name: openssl
# Version 1.1.1 is LTS, supported until 2023-09-11.
# https://www.openssl.org/about/releasestrat.html
Version: 1.1.1q
-Release: 1
+Release: 2
License: Apache-like
Group: Libraries
%if %{without snap}
@@ -415,6 +415,7 @@ fi
%doc CHANGES LICENSE NEWS README doc/*.txt
%attr(755,root,root) /%{_lib}/libcrypto.so.*.*
%attr(755,root,root) /%{_lib}/libssl.so.*.*
+%dir /%{_lib}/engines-1.1
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/certs
%dir %attr(700,root,root) %{_sysconfdir}/%{name}/private
@@ -422,7 +423,6 @@ fi
%files engines
%defattr(644,root,root,755)
-%dir /%{_lib}/engines-1.1
%attr(755,root,root) /%{_lib}/engines-1.1/*.so
%files tools
diff --git a/engines-dir.patch b/engines-dir.patch
index 20f5d1a..e89ee02 100644
--- a/engines-dir.patch
+++ b/engines-dir.patch
@@ -9,3 +9,12 @@
# Convenience variable for those who want to set the rpath in shared
# libraries and applications
+@@ -888,7 +888,7 @@ libcrypto.pc:
+ echo 'libdir=$(libdir)'; \
+ fi; \
+ echo 'includedir=$${prefix}/include'; \
+- echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
++ echo 'enginesdir=/$(LIBDIR)/engines-{- $sover_dirname -}'; \
+ echo ''; \
+ echo 'Name: OpenSSL-libcrypto'; \
+ echo 'Description: OpenSSL cryptography library'; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/ea23699e80f22aab0b8a72ae4b9b8c3011df3aab
More information about the pld-cvs-commit
mailing list