diff --git a/glib-2.74.4.tar.xz b/glib-2.74.5.tar.xz similarity index 41% rename from glib-2.74.4.tar.xz rename to glib-2.74.5.tar.xz index 98cfc3f7633bb27bd64fedec22d83b17aec5721f..aaa72facfe513b0fe31ab747dd11471ea93b2151 100644 Binary files a/glib-2.74.4.tar.xz and b/glib-2.74.5.tar.xz differ diff --git a/glib2.spec b/glib2.spec index 07c96d96beb53177cd3adcc3292e5c06d2ec1cbc..72d31d0c0754fc4d036bfc124e9d3c67be8c8491 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,7 +1,7 @@ %define anolis_release 1 %define url_ver %(echo %{version} | cut -d. -f1,2) Name: glib2 -Version: 2.74.4 +Version: 2.74.5 Release: %{anolis_release}%{?dist} Summary: A library of handy utility functions @@ -9,27 +9,24 @@ License: LGPLv2+ URL: https://www.gtk.org Source0: https://download.gnome.org/sources/glib/%{url_ver}/glib-%{version}.tar.xz -BuildRequires: chrpath BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gtk-doc BuildRequires: perl-interpreter +BuildRequires: meson >= 0.60.0 # for sys/inotify.h BuildRequires: glibc-devel -BuildRequires: libattr-devel -BuildRequires: libselinux-devel -BuildRequires: meson # for sys/sdt.h BuildRequires: systemtap-sdt-devel +BuildRequires: pkgconfig(bash-completion) >= 2.0 BuildRequires: pkgconfig(libelf) -BuildRequires: pkgconfig(libffi) -BuildRequires: pkgconfig(libpcre2-8) -BuildRequires: pkgconfig(mount) -BuildRequires: pkgconfig(sysprof-capture-4) +BuildRequires: pkgconfig(libffi) >= 3.0.0 +BuildRequires: pkgconfig(libpcre2-8) >= 10.32 +BuildRequires: pkgconfig(libselinux) >= 2.2 +BuildRequires: pkgconfig(mount) >= 2.23 +BuildRequires: pkgconfig(sysprof-capture-4) >= 3.38.0 BuildRequires: pkgconfig(zlib) BuildRequires: python3-devel -BuildRequires: /usr/bin/marshalparser # Remove gamin dependency Obsoletes: glib2-fam < 2.67.1-3 @@ -102,32 +99,27 @@ the functionality of the installed glib2 package. # do this, see https://github.com/mesonbuild/meson/issues/5027. touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py -chrpath --delete %{buildroot}%{_libdir}/*.so - # Perform byte compilation manually to avoid issues with # irreproducibility of the default invalidation mode, see # https://www.python.org/dev/peps/pep-0552/ %py_byte_compile %{python3} %{buildroot}%{_datadir} -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 - mkdir -p %{buildroot}%{_libdir}/gio/modules touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache %find_lang glib20 %transfiletriggerin -- %{_libdir}/gio/modules -gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : +%{_bindir}/gio-querymodules %{_libdir}/gio/modules &> /dev/null || : %transfiletriggerpostun -- %{_libdir}/gio/modules -gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : +%{_bindir}/gio-querymodules %{_libdir}/gio/modules &> /dev/null || : %transfiletriggerin -- %{_datadir}/glib-2.0/schemas -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %transfiletriggerpostun -- %{_datadir}/glib-2.0/schemas -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f glib20.lang %license COPYING @@ -148,7 +140,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %dir %{_libdir}/gio/modules %ghost %{_libdir}/gio/modules/giomodule.cache %{_bindir}/gio -%{_bindir}/gio-querymodules* +%{_bindir}/gio-querymodules %{_bindir}/glib-compile-schemas %{_bindir}/gsettings %{_bindir}/gdbus @@ -211,6 +203,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Sat Jan 21 2023 Funda Wang - 2.74.5-1 +- New version 2.74.5 +- Drop workaround for multi-lib as anolis 23 does not support + 32-bit environment even after enabling loongarch64 + * Thu Dec 22 2022 Funda Wang - 2.74.4-1 - New version 2.74.4