From 721f4ce70038861e5b23a03f2dc7a99282bcb279 Mon Sep 17 00:00:00 2001 From: t_feng Date: Mon, 8 Nov 2021 20:22:54 +0800 Subject: [PATCH] rebase master --- glib2.spec | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/glib2.spec b/glib2.spec index 3d30bc2..4577fe6 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,6 +1,6 @@ Name: glib2 Version: 2.68.1 -Release: 3 +Release: 6 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: http://www.gtk.org @@ -13,7 +13,8 @@ BuildRequires: chrpath gcc gcc-c++ gettext gtk-doc perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson BuildRequires: systemtap-sdt-devel pkgconfig(libelf) pkgconfig(libffi) BuildRequires: pkgconfig(libpcre) pkgconfig(mount) pkgconfig(zlib) -BuildRequires: python3-devel gamin-devel pkgconfig(sysprof-capture-4) +BuildRequires: python3-devel pkgconfig(sysprof-capture-4) +BuildRequires: desktop-file-utils shared-mime-info Provides: %{name}-fam = %{version}-%{release} Obsoletes: %{name}-fam < %{version}-%{release} @@ -31,6 +32,7 @@ developed in parallel ever since. %package devel Summary: Development and test files for the GLib library Requires: %{name} = %{version}-%{release} +Requires: gdb-headless Provides: %{name}-static = %{version}-%{release} Provides: %{name}-tests = %{version}-%{release} @@ -55,12 +57,15 @@ help document for the glib2 package. %build rm glib/pcre/*.[ch] %meson --default-library=both -Dman=true -Ddtrace=true -Dsysprof=enabled \ - -Dsystemtap=true -Dgtk_doc=true -Dfam=true -Dinstalled_tests=true + -Dsystemtap=true -Dgtk_doc=true -Dinstalled_tests=true %meson_build find . -name *.dtrace-temp.c -exec rm -f {} \; +%check +%meson_test + %install %meson_install touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py @@ -70,7 +75,14 @@ export PYTHONHASHSEED=0 %py_byte_compile %{__python3} %{buildroot}%{_datadir} mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits} +mkdir -p %{buildroot}%{_libdir}/gio/modules/ touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache + +# remove pycache +rm -rf %{buildroot}/%{_datadir}/gdb/auto-load/%{_libdir}/__pycache__ +rm -rf %{buildroot}/%{_datadir}/glib-2.0/codegen/__pycache__ +rm -rf %{buildroot}/%{_datadir}/glib-2.0/gdb/__pycache__ + %find_lang glib20 %transfiletriggerin -- %{_libdir}/gio/modules @@ -90,7 +102,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %doc AUTHORS NEWS README %license COPYING %{_libdir}/*.so.* -%{_libdir}/gio/modules/libgiofam.so %dir %{_libdir}/gio %ghost %{_libdir}/gio/modules/giomodule.cache @@ -121,7 +132,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/aclocal/* %{_datadir}/glib-2.0/* %{_datadir}/bash-completion/completions/gresource -%{_datadir}/gdb/ +%{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py %{_datadir}/gettext/ %{_datadir}/systemtap/ %{_datadir}/installed-tests @@ -143,6 +154,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %doc %{_datadir}/gtk-doc/html/* %changelog +* Mon Nov 14 2021 fengtao - 2.68.1-6 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:add require gdb-headless for devel + + +* Tue Sep 14 2021 yangcheng - 2.68.1-5 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:Drop dependebcy on gamin + +* Tue Sep 7 2021 fengtao - 2.68.1-4 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:enable all tests + * Sat Aug 14 2021 liuyumeng - 2.68.1-3 - Type:bugfix - Id:NA -- Gitee