From 4980b39c441babc2c858e76acb6b8064a57370b7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Jun 05 2023 16:46:26 +0000 Subject: Avoid qrencode dependency in RHEL builds Based on c9s: https://gitlab.com/redhat/centos-stream/rpms/systemd/-/commit/c7784e658433844e056b6cab5bf3186f093b9f79 --- diff --git a/systemd.spec b/systemd.spec index 2610741..68f2539 100644 --- a/systemd.spec +++ b/systemd.spec @@ -141,7 +141,9 @@ BuildRequires: kmod-devel BuildRequires: elfutils-devel BuildRequires: openssl-devel BuildRequires: gnutls-devel +%if %{undefined rhel} BuildRequires: qrencode-devel +%endif BuildRequires: libmicrohttpd-devel BuildRequires: libxkbcommon-devel BuildRequires: iptables-devel @@ -236,7 +238,9 @@ Recommends: libidn2.so.0(IDN2_0.0.0)%{?elf_bits} Recommends: libpcre2-8.so.0%{?elf_suffix} Recommends: libpwquality.so.1%{?elf_suffix} Recommends: libpwquality.so.1(LIBPWQUALITY_1.0)%{?elf_bits} +%if %{undefined rhel} Recommends: libqrencode.so.4%{?elf_suffix} +%endif Recommends: libbpf.so.0%{?elf_suffix} Recommends: libbpf.so.0(LIBBPF_0.4.0)%{?elf_bits} @@ -589,7 +593,7 @@ CONFIGURE_OPTS=( -Dlibcryptsetup=%[%{with bootstrap}?"false":"true"] -Delfutils=true -Dpwquality=true - -Dqrencode=true + -Dqrencode=%[%{defined rhel}?"false":"true"] -Dgnutls=true -Dmicrohttpd=true -Dlibidn2=true