Resolve libcrypto dependency using pkgconfig

diff --git a/.github/workflows/ci-fedora.yml b/.github/workflows/ci-fedora.yml
index 3d892bfed469180afc37167d0427d0a40ab4fe94..9faae6870e9af1decac91328dc91ab663d1a8818 100644 (file)
--- a/.github/workflows/ci-fedora.yml
+++ b/.github/workflows/ci-fedora.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: dnf -y install acl autoconf automake awk boost-devel btrfs-progs-devel dbus-devel diffutils docbook-style-xsl gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz openssl-devel
+      run: dnf -y install acl autoconf automake awk boost-devel btrfs-progs-devel dbus-devel diffutils docbook-style-xsl gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz "pkgconfig(libcrypto)"
 
     - name: List installed packages
       run: rpm -qa | sort

diff --git a/.github/workflows/ci-leap.yml b/.github/workflows/ci-leap.yml
index 27973cd1102a08cf7a042241022e6de44061bb7f..bcb45d1d9c77f80bc4862e241019106625ba44a0 100644 (file)
--- a/.github/workflows/ci-leap.yml
+++ b/.github/workflows/ci-leap.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz libopenssl-devel
+      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz "pkgconfig(libcrypto)"
 
     - name: List installed packages
       run: rpm -qa | sort

diff --git a/.github/workflows/ci-tumbleweed.yml b/.github/workflows/ci-tumbleweed.yml
index 137893044c0821bd6db98491cde3b21742464538..1c82b539c1a822f0a3fb2b0db96bb0d1587b9107 100644 (file)
--- a/.github/workflows/ci-tumbleweed.yml
+++ b/.github/workflows/ci-tumbleweed.yml
@@ -21,7 +21,7 @@ jobs:
         elif [ "${{ matrix.compiler }}" = "clang" ]; then
           zypper --non-interactive install --no-recommends clang
         fi
-        zypper --non-interactive install --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gettext-runtime glibc-locale libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz libopenssl-devel
+        zypper --non-interactive install --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gettext-runtime glibc-locale libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz "pkgconfig(libcrypto)"
 
     - name: List installed packages
       run: rpm -qa | sort

diff --git a/snapper.spec.in b/snapper.spec.in
index dab80a120688278c4df45dd7bd8bf2d611634af9..9f62ce95ba1bb7a69755705a512461af1c6abfb7 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -106,11 +106,7 @@ BuildRequires:  zlib-devel
 %if %{with coverage}
 BuildRequires:  lcov
 %endif
-%if 0%{?suse_version}
-BuildRequires:  libopenssl-devel
-%else
-BuildRequires:  openssl-devel
-%endif
+BuildRequires:  pkgconfig(libcrypto)
 Requires:       dbus-service
 Requires:       diffutils
 Requires:       libsnapper@LIBVERSION_MAJOR@ = %version