Drop dependency on gamin

This commit is contained in:
Peter Robinson 2021-01-22 13:23:38 +00:00
parent c71d2f1ddf
commit 485a4ccc12

View File

@ -1,6 +1,6 @@
Name: glib2 Name: glib2
Version: 2.67.1 Version: 2.67.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: A library of handy utility functions Summary: A library of handy utility functions
License: LGPLv2+ License: LGPLv2+
@ -39,6 +39,9 @@ BuildRequires: python3-devel
# for GIO content-type support # for GIO content-type support
Recommends: shared-mime-info Recommends: shared-mime-info
# Remove gamin dependency
Obsoletes: glib2-fam < 2.67.1-3
# glib 2.59.0 hash table changes broke older gcr versions / password prompts in gnome-shell # glib 2.59.0 hash table changes broke older gcr versions / password prompts in gnome-shell
Conflicts: gcr < 3.28.1 Conflicts: gcr < 3.28.1
@ -65,14 +68,6 @@ BuildArch: noarch
The glib2-doc package includes documentation for the GLib library. The glib2-doc package includes documentation for the GLib library.
%if !0%{?rhel} %if !0%{?rhel}
%package fam
Summary: FAM monitoring module for GIO
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: gamin-devel
%description fam
The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO.
%package static %package static
Summary: glib static Summary: glib static
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
@ -109,7 +104,6 @@ rm glib/pcre/*.[ch]
-Dgnutls=true \ -Dgnutls=true \
%endif %endif
%if !0%{?rhel} %if !0%{?rhel}
-Dfam=true \
--default-library=both \ --default-library=both \
%endif %endif
%{nil} %{nil}
@ -222,9 +216,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%doc %{_datadir}/gtk-doc/html/* %doc %{_datadir}/gtk-doc/html/*
%if !0%{?rhel} %if !0%{?rhel}
%files fam
%{_libdir}/gio/modules/libgiofam.so
%files static %files static
%{_libdir}/libgio-2.0.a %{_libdir}/libgio-2.0.a
%{_libdir}/libglib-2.0.a %{_libdir}/libglib-2.0.a
@ -238,6 +229,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Fri Jan 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.67.1-3
- Drop dependency on gamin
* Sat Dec 19 2020 Kevin Fenzi <kevin@scrye.com> - 2.67.1-2 * Sat Dec 19 2020 Kevin Fenzi <kevin@scrye.com> - 2.67.1-2
- Add already upstream patch to fix gdm crasher. - Add already upstream patch to fix gdm crasher.