diff --git a/rng-tools.spec b/rng-tools.spec index cbbb4a6..5a41f18 100644 --- a/rng-tools.spec +++ b/rng-tools.spec @@ -1,16 +1,18 @@ %global _hardened_build 1 %global _sbindir /sbin + %if 0%{?rhel} && 0%{?rhel} >= 9 %bcond_with pkcs11 +%bcond_with rtlsdr %else %bcond_without pkcs11 +%bcond_without rtlsdr %endif - Summary: Random number generator related utilities Name: rng-tools Version: 6.10 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://github.com/nhorman/rng-tools Source0: https://github.com/nhorman/rng-tools/archive/rng-tools-%{version}.tar.gz @@ -19,15 +21,17 @@ Source1: rngd.service # https://sourceforge.net/p/gkernel/patches/111/ BuildRequires: gcc make -BuildRequires: gettext -BuildRequires: systemd-units +BuildRequires: gettext +BuildRequires: systemd-units BuildRequires: libgcrypt-devel BuildRequires: autoconf automake BuildRequires: libsysfs-devel libcurl-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: jitterentropy-devel BuildRequires: jansson-devel +%if %{with rtlsdr} BuildRequires: rtl-sdr-devel +%endif %if %{with pkcs11} BuildRequires: libp11-devel %endif @@ -40,16 +44,19 @@ Provides: jitterentropy-rngd %description Hardware random number generation tools. -%prep -%autosetup +%prep +%autosetup %build -./autogen.sh -%if %{with pkcs11} -%configure -%else -%configure --without-pkcs11 +%if !%{with pkcs11} +%define _without_pkcs11 --without-pkcs11 %endif +%if !%{with rtlsdr} +%define _without_rtlsdr --without-rtlsdr +%endif + +./autogen.sh +%configure %{?_without_pkcs11} %{?_without_rtlsdr} %make_build %install @@ -78,6 +85,10 @@ install -Dt %{buildroot}%{_unitdir} -m0644 %{SOURCE1} %attr(0644,root,root) %{_unitdir}/rngd.service %changelog +* Mon Nov 16 2020 Vladis Dronov - 6.10-7 +- Make rtl-sdr optional +- For RHEL9 and above, do not build with rtl-sdr + * Mon Oct 05 2020 Troy Dawson - 6.10-6 - Make pkcs11 optional - For RHEL9 and above, do not build with pkcs11