Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2022-03-23 20:15:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Wed Mar 23 20:15:52 2022 rev:249 rq:962641 version:2.70.5 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2022-02-13 19:50:46.314169412 +0100 +++ /work/SRC/openSUSE:Factory/.glib2.new.25692/glib2.changes 2022-03-23 20:16:17.110391707 +0100 @@ -1,0 +2,21 @@ +Thu Mar 17 14:56:29 UTC 2022 - Dominique Leuenberger <[email protected]> + +- Update to version 2.70.5: + + g_time_zone_new_offset() assertion failure if offset >= 25 + hours. + + glib: fix buffer overflow in g_canonicalize_filename(). + + gtimezone: Fix assertion failure when called with a huge + offset. + + Updated translations. + +------------------------------------------------------------------- +Mon Feb 28 18:15:50 UTC 2022 - Dirk M??ller <[email protected]> + +- Split gtk-docs from -devel package, these are not needed + during building projects using glib2 +- Use _multibuild as the meson buildprocess is very awkward + regarding the documentation - builds single-jobs only and + twice (again during %install). This way the rest of distribution + waiting for glib2-devel to be available is not blocked by this + +------------------------------------------------------------------- Old: ---- glib-2.70.4.tar.xz New: ---- _multibuild glib-2.70.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.8t33fB/_old 2022-03-23 20:16:18.162392302 +0100 +++ /var/tmp/diff_new_pack.8t33fB/_new 2022-03-23 20:16:18.166392304 +0100 @@ -1,5 +1,5 @@ # -# spec file for package glib2 +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -17,9 +17,20 @@ %bcond_without systemtap -%bcond_without gtk_doc -Name: glib2 -Version: 2.70.4 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "doc" +%global psuffix -doc +%else +%global psuffix %{nil} +%endif +%define libver 2_0-0 +%define libgio libgio-%{libver} +%define libglib libglib-%{libver} +%define libgmodule libgmodule-%{libver} +%define libgobject libgobject-%{libver} +%define libgthread libgthread-%{libver} +Name: glib2%{psuffix} +Version: 2.70.5 Release: 0 Summary: General-Purpose Utility Library License: LGPL-2.1-or-later @@ -47,7 +58,10 @@ Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch [email protected] -- Remove version string from files generated by gdbus-codegen Patch4: glib2-gdbus-codegen-version.patch - +%if "%{flavor}" == "doc" +# Split-provides +Provides: glib2-devel:%{_datadir}/gtk-doc/html/gobject/index.html +%endif BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gcc-c++ @@ -65,9 +79,8 @@ BuildRequires: pkgconfig(libpcre) >= 8.31 BuildRequires: pkgconfig(mount) >= 2.28 BuildRequires: pkgconfig(zlib) -# gtk-doc requires glib2-devel, but we will only be building this here; break up a cycle -#!BuildIgnore: glib2-devel -%if %{with gtk_doc} +%if "%{flavor}" == "doc" +BuildRequires: glib2-devel BuildRequires: gtk-doc >= 1.32 %endif %if %{with systemtap} @@ -80,12 +93,9 @@ data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on. -%define libver 2_0-0 -%define libgio libgio-%{libver} -%define libglib libglib-%{libver} -%define libgmodule libgmodule-%{libver} -%define libgobject libgobject-%{libver} -%define libgthread libgthread-%{libver} +%if %{with doc} +This package provides the documentation for the GLib library. +%endif %package tools Summary: Tools from glib2, a general-purpose utility library @@ -269,7 +279,7 @@ --default-library=both \ -Dselinux=enabled \ -Dman=true \ -%if %{with gtk_doc} +%if "%{flavor}" == "doc" -Dgtk_doc=true \ %endif %if %{with systemtap} @@ -285,7 +295,9 @@ %install %meson_install - +%if "%{flavor}" == "doc" +find %{buildroot}/%{_prefix} -not -path "*%{_datadir}/gtk-doc/*" -delete || : +%else %find_lang glib20 %{?no_lang_C} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh @@ -316,7 +328,7 @@ %fdupes %{buildroot}/%{_prefix} # Too many users complain about schemas compiled with wrong permissions -# when in fact the system just honours there umask setting +# when in fact the system just honours their umask setting # subshell restores umask for paranoia mode %define compile_schemas \ (umask 022 && %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas) @@ -340,6 +352,7 @@ [Default Applications] EOF done +%endif %check ### FIXME ### Figure out how to run the "stable tests" only ref info from upstream. @@ -353,6 +366,13 @@ %postun -n %{libgio} -p %{ldconfig} %postun -n %{libgmodule} -p %{ldconfig} +%if "%{flavor}" == "doc" +%files +%{_datadir}/gtk-doc/html/gio +%{_datadir}/gtk-doc/html/glib +%{_datadir}/gtk-doc/html/gobject +%else + %files tools %license COPYING %{_bindir}/gapplication @@ -459,11 +479,6 @@ %dir %{_libdir}/glib-2.0/ %{_libdir}/glib-2.0/include/ %{_libdir}/pkgconfig/*.pc -%if %{with gtk_doc} -%{_datadir}/gtk-doc/html/gio -%{_datadir}/gtk-doc/html/glib -%{_datadir}/gtk-doc/html/gobject -%endif %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py %if %{with systemtap} %dir %{_datadir}/systemtap @@ -474,15 +489,15 @@ %{_datadir}/systemtap/tapset/*/libgobject-*.so.*.stp %endif %{_rpmmacrodir}/macros.glib2 -# Own these directories to not avoid breakages throughout the project -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html # Own these directories to avoid build requirement on gdb # only for directories ownership %dir %{_datadir}/gdb %dir %{_datadir}/gdb/auto-load %dir %{_datadir}/gdb/auto-load%{_prefix} %dir %{_datadir}/gdb/auto-load%{_libdir} +# Own these directories to not avoid breakages throughout the project +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %files devel-static %license COPYING @@ -491,14 +506,13 @@ %files lang -f glib20.lang %license COPYING -%define testdir %{_libexecdir}/installed-tests/glib - %files tests-devel %license COPYING %{_libexecdir}/installed-tests -%attr(0444 - -) %{testdir}/x-content/win32-software/autorun.exe -%attr(0755 - -) %{testdir}/taptestrunner.py -%attr(0755 - -) %{testdir}/x-content/unix-software/autorun.sh +%attr(0444 - -) %{_libexecdir}/installed-tests/glib/x-content/win32-software/autorun.exe +%attr(0755 - -) %{_libexecdir}/installed-tests/glib/taptestrunner.py +%attr(0755 - -) %{_libexecdir}/installed-tests/glib/x-content/unix-software/autorun.sh %{_datadir}/installed-tests +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>doc</package> </multibuild> ++++++ glib-2.70.4.tar.xz -> glib-2.70.5.tar.xz ++++++ ++++ 6694 lines of diff (skipped)
