rpms/glib2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/glib2.git#341fea0648a59b55aa84c66572302cd2dfeb316e
This commit is contained in:
DistroBaker 2020-12-04 13:37:01 +00:00
parent 4eb856da4e
commit c3d48da726
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glib2.spec
View File

@ -1,6 +1,6 @@
Name: glib2 Name: glib2
Version: 2.67.0 Version: 2.67.0
Release: 5%{?dist} Release: 7%{?dist}
Summary: A library of handy utility functions Summary: A library of handy utility functions
License: LGPLv2+ License: LGPLv2+
@ -69,6 +69,7 @@ BuildArch: noarch
%description doc %description doc
The glib2-doc package includes documentation for the GLib library. The glib2-doc package includes documentation for the GLib library.
%if !0%{?rhel}
%package fam %package fam
Summary: FAM monitoring module for GIO Summary: FAM monitoring module for GIO
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
@ -77,7 +78,6 @@ BuildRequires: gamin-devel
%description fam %description fam
The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO. The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO.
%if 0%{?fedora}
%package static %package static
Summary: glib static Summary: glib static
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
@ -109,12 +109,12 @@ rm glib/pcre/*.[ch]
-Ddtrace=true \ -Ddtrace=true \
-Dsystemtap=true \ -Dsystemtap=true \
-Dgtk_doc=true \ -Dgtk_doc=true \
-Dfam=true \
-Dinstalled_tests=true \ -Dinstalled_tests=true \
%if 0%{?rhel} %if 0%{?rhel}
-Dgnutls=true \ -Dgnutls=true \
%endif %endif
%if 0%{?fedora} %if !0%{?rhel}
-Dfam=true \
--default-library=both \ --default-library=both \
%endif %endif
%{nil} %{nil}
@ -140,6 +140,7 @@ export PYTHONHASHSEED=0
mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits} mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits}
sed -i -e "/^gio_querymodules=/s/gio-querymodules/gio-querymodules-%{__isa_bits}/" %{buildroot}%{_libdir}/pkgconfig/gio-2.0.pc sed -i -e "/^gio_querymodules=/s/gio-querymodules/gio-querymodules-%{__isa_bits}/" %{buildroot}%{_libdir}/pkgconfig/gio-2.0.pc
mkdir -p %{buildroot}%{_libdir}/gio/modules
touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
%find_lang glib20 %find_lang glib20
@ -225,10 +226,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files doc %files doc
%doc %{_datadir}/gtk-doc/html/* %doc %{_datadir}/gtk-doc/html/*
%if !0%{?rhel}
%files fam %files fam
%{_libdir}/gio/modules/libgiofam.so %{_libdir}/gio/modules/libgiofam.so
%if 0%{?fedora}
%files static %files static
%{_libdir}/libgio-2.0.a %{_libdir}/libgio-2.0.a
%{_libdir}/libglib-2.0.a %{_libdir}/libglib-2.0.a
@ -242,6 +243,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Fri Dec 04 2020 Ondrej Holy <oholy@redhat.com> - 2.67.0-7
- Explicitly create modules dir to fix ELN build
* Tue Dec 01 2020 Ondrej Holy and Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-6
- Disable glib2-fam in RHEL
* Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.67.0-5 * Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.67.0-5
- Backport upstream patches to fix invalid use of volatile objects - Backport upstream patches to fix invalid use of volatile objects
(gcc 11 support) (gcc 11 support)