From 782b558c9291f7aef87db9b45dd13f6c7df78eb0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sat, 12 Dec 2020 23:38:05 +0100 Subject: [PATCH] Remove uhttpmock-devel from BuildRequires on RHEL 9 This reverts commit 87d15532bc5cae3a9126ee8f352de1ecd4dfae01 and restores the build conditionals that went missing during the switch to Meson in commit 83c9c1be3096db2422bf707e685681ff549a4bf8. https://bugzilla.redhat.com/show_bug.cgi?id=1904990 --- libgdata.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libgdata.spec b/libgdata.spec index ef9ed03..462a855 100644 --- a/libgdata.spec +++ b/libgdata.spec @@ -1,6 +1,6 @@ Name: libgdata Version: 0.17.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for the GData protocol License: LGPLv2+ @@ -13,7 +13,7 @@ BuildRequires: glib2-devel BuildRequires: gnome-online-accounts-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if ! 0%{?rhel} BuildRequires: uhttpmock-devel %endif BuildRequires: json-glib-devel @@ -46,6 +46,11 @@ developing applications that use %{name}. %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %meson \ +%if 0%{?rhel} + -Dalways_build_tests=false \ +%else + -Dalways_build_tests=true \ +%endif -Dinstalled_tests=false \ -Dgtk_doc=true \ %{nil} @@ -83,6 +88,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_datadir}/vala/ %changelog +* Sat Dec 12 2020 Debarshi Ray - 0.17.13-2 +- Remove uhttpmock-devel from BuildRequires on RHEL 9 + * Thu Sep 03 2020 Kalev Lember - 0.17.13-1 - Update to 0.17.13