Notification time stamped 2021-03-01 06:17:15 UTC
From 880f7e1ca11d5de939aa652d603cc7d6b847ab42 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tomas.popela(a)gmail.com>
Date: Feb 22 2021 15:39:32 +0000
Subject: Add option to disable unit tests
kyua is currently broken if compiled with GCC 11[0]. It prevents pkgconf
to build successfully as the unit tests are enabled in check phase.
Disable the tests on RHEL due to its extensive (from RHEL POV)
dependencies.
[0] -
https://bugzilla.redhat.com/show_bug.cgi?id=1926779
---
diff --git a/pkgconf.spec b/pkgconf.spec
index 034fa2a..f5c77cd 100644
--- a/pkgconf.spec
+++ b/pkgconf.spec
@@ -12,12 +12,19 @@
%global pkgconfig_evr 1:%{pkgconfig_verrel}
%endif
+# Tests are disabled on RHEL 9 because of the extensive dependencies
+%if 0%{?rhel} >= 9
+%bcond_with tests
+%else
+%bcond_without tests
+%endif
+
# Search path for pc files for pkgconf
%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
Name: pkgconf
Version: 1.7.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Package compiler and linker metadata toolkit
License: ISC
@@ -37,9 +44,11 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+%if %{with tests}
# For unit tests
BuildRequires: kyua
BuildRequires: atf-tests
+%endif
# pkgconf uses libpkgconf internally
Requires: lib%{name}%{?_isa} = %{version}-%{release}
@@ -117,7 +126,9 @@ autoreconf -fiv
%check
+%if %{with tests}
make check
+%endif
%install
@@ -202,6 +213,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal
%endif
%changelog
+* Mon Feb 22 2021 Tomas Popela <tpopela(a)redhat.com> - 1.7.3-7
+- Conditionalize the unit tests, disable them on RHEL 9
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.3-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
https://src.fedoraproject.org/rpms/pkgconf/c/880f7e1ca11d5de939aa652d603c...