From: Cheng-Ling Lai Date: Tue, 4 Aug 2026 03:20:34 +0000 (+0800) Subject: Resolve libcrypto dependency using pkgconfig X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57364621bf774bf2fc82ac2fe3b6102fa7bb4f58;p=thirdparty%2Fsnapper.git Resolve libcrypto dependency using pkgconfig --- diff --git a/.github/workflows/ci-fedora.yml b/.github/workflows/ci-fedora.yml index 3d892bfe..9faae687 100644 --- 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 27973cd1..bcb45d1d 100644 --- 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 13789304..1c82b539 100644 --- 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 dab80a12..9f62ce95 100644 --- 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