- enhanced engines-dir patch to adjust enginesdir in libcrypto.pc file; release 2

diff --git a/engines-dir.patch b/engines-dir.patch
index f8c6291f59e7f627d0d51db9bc69ecfeaa323b2f..513e8773de13f1c1c9bc424a482cbd03f594f739 100644 (file)
--- a/engines-dir.patch
+++ b/engines-dir.patch
@@ -1,6 +1,6 @@
---- openssl-3.0.0/Configurations/unix-Makefile.tmpl~   2021-09-18 10:59:16.000000000 +0200
-+++ openssl-3.0.0/Configurations/unix-Makefile.tmpl    2021-09-18 11:01:29.191573488 +0200
-@@ -303,8 +303,8 @@
+--- openssl-3.0.5/Configurations/unix-Makefile.tmpl.orig       2022-07-10 17:18:36.338376691 +0200
++++ openssl-3.0.5/Configurations/unix-Makefile.tmpl    2022-07-10 17:29:34.034813643 +0200
+@@ -304,8 +304,8 @@ LIBDIR={- our $libdir = $config{libdir};
  # $(libdir) is chosen to be compatible with the GNU coding standards
  libdir={- file_name_is_absolute($libdir)
            ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
@@ -11,3 +11,14 @@
  
  # Convenience variable for those who want to set the rpath in shared
  # libraries and applications
+@@ -1399,8 +1399,8 @@ libcrypto.pc:
+               echo 'libdir=$(libdir)'; \
+           fi; \
+           echo 'includedir=$${prefix}/include'; \
+-          echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
+-          echo 'modulesdir=$${libdir}/ossl-modules'; \
++          echo 'enginesdir=/$(LIBDIR)/engines-{- $sover_dirname -}'; \
++          echo 'modulesdir=/$(LIBDIR)/ossl-modules'; \
+           echo ''; \
+           echo 'Name: OpenSSL-libcrypto'; \
+           echo 'Description: OpenSSL cryptography library'; \

diff --git a/openssl.spec b/openssl.spec
index b411c731bb7c4ede063508439b01d1e41986962b..5ee3e583cae93961b3c51afe28ced789f70af315 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -14,7 +14,7 @@ Summary(ru.UTF-8):    Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
 Version:       3.0.5
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Libraries
 Source0:       https://www.openssl.org/source/%{name}-%{version}.tar.gz