- enhanced engines-dir patch to adjust enginesdir in libcrypto.pc file, moved engines...

diff --git a/engines-dir.patch b/engines-dir.patch
index 20f5d1a0d4a66d2df70e7f33a749c2848c9eccbc..e89ee02386ca9a08075d3ebe3927c6b33045012c 100644 (file)
--- 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'; \

diff --git a/openssl.spec b/openssl.spec
index 4092cdb8b7e8be3b266a2c6b6b70ff3b7782fd12..1d5c9baa7b81d11ba988f9aafead81361a391702 100644 (file)
--- 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