From 865cb43a8c81b1a8a0a44f0d439b0d50494084a5 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 10 May 2024 10:25:31 +0200 Subject: [PATCH] Use zlib-ng for Fedora It should be ABI compatible with the old zlib https://fedoraproject.org/wiki/Changes/ZlibNGTransition --- .github/setup-fedora.sh | 4 ++-- packaging/opensc.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/setup-fedora.sh b/.github/setup-fedora.sh index 5f280cea92..4cbeb743d2 100755 --- a/.github/setup-fedora.sh +++ b/.github/setup-fedora.sh @@ -13,9 +13,9 @@ fi # 64bit or 32bit dependencies if [ "$1" == "ix86" ]; then - DEPS="$DEPS pcsc-lite-devel*.i686 readline-devel*.i686 openssl-devel*.i686 zlib-devel*.i686 libcmocka-devel*.i686 glibc-devel*i686" + DEPS="$DEPS pcsc-lite-devel*.i686 readline-devel*.i686 openssl-devel*.i686 zlib-ng-devel*.i686 libcmocka-devel*.i686 glibc-devel*i686" else - DEPS="$DEPS pcsc-lite-devel readline-devel openssl-devel zlib-devel libcmocka-devel" + DEPS="$DEPS pcsc-lite-devel readline-devel openssl-devel zlib-ng-devel libcmocka-devel" fi sudo dnf install -y $DEPS diff --git a/packaging/opensc.spec b/packaging/opensc.spec index 7310d80058..5700e62e66 100644 --- a/packaging/opensc.spec +++ b/packaging/opensc.spec @@ -16,7 +16,7 @@ BuildRequires: /usr/bin/xsltproc BuildRequires: docbook-style-xsl BuildRequires: autoconf automake libtool gcc BuildRequires: bash-completion -BuildRequires: zlib-devel +BuildRequires: zlib-ng-devel # For tests BuildRequires: libcmocka-devel BuildRequires: vim-common