diff --git a/fix-accidentally-delete-temp-file-within-dtrace.patch b/fix-accidentally-delete-temp-file-within-dtrace.patch new file mode 100644 index 0000000000000000000000000000000000000000..e3eea52b7b7cf9115edb4c6972865043029952ba --- /dev/null +++ b/fix-accidentally-delete-temp-file-within-dtrace.patch @@ -0,0 +1,31 @@ +From c89133504b600c653d56e56648764e49f5f127cc Mon Sep 17 00:00:00 2001 +From: hexiujun +Date: Mon, 2 Mar 2020 10:49:04 +0800 +Subject: [PATCH] fix accidentally delete temp file within dtrace + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d1551bd..4e56f06 100644 +--- a/meson.build ++++ b/meson.build +@@ -2066,12 +2066,12 @@ if want_dtrace + # FIXME: autotools build also passes -fPIC -DPIC but is it needed in this case? + dtrace_obj_gen = generator(dtrace, + output : '@BASENAME@.o', +- arguments : ['-G', '-s', '@INPUT@', '-o', '@OUTPUT@']) ++ arguments : ['-G', '-k', '-s', '@INPUT@', '-o', '@OUTPUT@']) + # FIXME: $(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," + # -e "s,define _SDT_HAS_SEMAPHORES 1,undef _SDT_HAS_SEMAPHORES," + dtrace_hdr_gen = generator(dtrace, + output : '@BASENAME@.h', +- arguments : ['-h', '-s', '@INPUT@', '-o', '@OUTPUT@']) ++ arguments : ['-h', '-k', '-s', '@INPUT@', '-o', '@OUTPUT@']) + glib_conf.set('HAVE_DTRACE', 1) + enable_dtrace = true + endif +-- +1.8.3.1 + diff --git a/glib-2.62.1.tar.xz b/glib-2.62.5.tar.xz similarity index 39% rename from glib-2.62.1.tar.xz rename to glib-2.62.5.tar.xz index 0475f58122ccbda5aa0c5230c63b7f6d78f95b99..f8ab5fa4fdd911c05262f16e9aa9e922a356afd9 100644 Binary files a/glib-2.62.1.tar.xz and b/glib-2.62.5.tar.xz differ diff --git a/glib2.spec b/glib2.spec index 007791594d036030908ef0f833e7a38f9405442e..e63c4e4640774bd76fe88bb67d21df5e70597dea 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,11 +1,13 @@ Name: glib2 -Version: 2.62.1 +Version: 2.62.5 Release: 1 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: http://www.gtk.org Source0: http://download.gnome.org/sources/glib/2.62/glib-%{version}.tar.xz +Patch9001: fix-accidentally-delete-temp-file-within-dtrace.patch + 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) @@ -56,6 +58,8 @@ rm glib/pcre/*.[ch] %meson_build +find . -name *.dtrace-temp.c -exec rm -f {} \; + %install %meson_install touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py @@ -111,6 +115,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/*.a %{_includedir}/* %{_libexecdir}/installed-tests +%exclude %{_libexecdir}/installed-tests/glib/cert-tests +%exclude %{_libexecdir}/installed-tests/glib/tls-certificate %{_datadir}/aclocal/* %{_datadir}/glib-2.0/* @@ -119,6 +125,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gettext/ %{_datadir}/systemtap/ %{_datadir}/installed-tests +%exclude %{_datadir}/installed-tests/glib/tls-certificate.test %{_bindir}/glib-genmarshal %{_bindir}/glib-gettextize @@ -136,6 +143,27 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %doc %{_datadir}/gtk-doc/html/* %changelog +* Thu Jul 21 2020 hanhui - 2.62.5-1 +- Update to 2.62.5 + +* Mon Mar 2 2020 hexiujun - 2.62.1-4 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:fix accidentally delete temp file within dtrace + +* Fri Feb 28 2020 zhangrui - 2.62.1-3 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:remove dist in spec + +* Mon Feb 24 2020 openEuler Buildteam - 2.62.1-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:exclude some unnecessary files + * Thu Jan 9 2020 openEuler Buildteam - 2.62.1-1 - update to 2.62.1