From 4d9a5aaf01c7dbde39006ed02f367a44ee42cebe Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 1 Dec 2020 09:52:14 -0600 Subject: [PATCH] Adjust conditionals that disable glib2-fam --- glib2.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/glib2.spec b/glib2.spec index 4b456ef..8b71dd7 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,6 +1,6 @@ Name: glib2 Version: 2.67.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library of handy utility functions License: LGPLv2+ @@ -69,7 +69,7 @@ BuildArch: noarch %description doc The glib2-doc package includes documentation for the GLib library. -%if 0%{?fedora} || 0%{?rhel} <= 8 +%if !0%{?rhel} %package fam Summary: FAM monitoring module for GIO Requires: %{name}%{?_isa} = %{version}-%{release} @@ -77,9 +77,7 @@ BuildRequires: gamin-devel %description fam The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO. -%endif -%if 0%{?fedora} %package static Summary: glib static Requires: %{name}-devel = %{version}-%{release} @@ -111,14 +109,12 @@ rm glib/pcre/*.[ch] -Ddtrace=true \ -Dsystemtap=true \ -Dgtk_doc=true \ -%if 0%{?fedora} || 0%{?rhel} <= 8 - -Dfam=true \ -%endif -Dinstalled_tests=true \ %if 0%{?rhel} -Dgnutls=true \ %endif -%if 0%{?fedora} +%if !0%{?rhel} + -Dfam=true \ --default-library=both \ %endif %{nil} @@ -229,12 +225,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files doc %doc %{_datadir}/gtk-doc/html/* -%if 0%{?fedora} || 0%{?rhel} <= 8 +%if !0%{?rhel} %files fam %{_libdir}/gio/modules/libgiofam.so -%endif -%if 0%{?fedora} %files static %{_libdir}/libgio-2.0.a %{_libdir}/libglib-2.0.a @@ -248,6 +242,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Tue Dec 01 2020 Ondrej Holy and Michael Catanzaro - 2.67.0-6 +- Disable glib2-fam in RHEL + * Tue Nov 24 2020 Kalev Lember - 2.67.0-5 - Backport upstream patches to fix invalid use of volatile objects (gcc 11 support)