Hello community, here is the log from the commit of package libgnome for openSUSE:Factory checked in at 2019-08-13 20:44:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgnome (Old) and /work/SRC/openSUSE:Factory/.libgnome.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgnome" Tue Aug 13 20:44:36 2019 rev:58 rq:723063 version:2.32.2+20180228.6a7dbfb9 Changes: -------- --- /work/SRC/openSUSE:Factory/libgnome/libgnome.changes 2018-03-22 12:12:29.969797167 +0100 +++ /work/SRC/openSUSE:Factory/.libgnome.new.9556/libgnome.changes 2019-08-13 20:44:39.815055560 +0200 @@ -1,0 +2,23 @@ +Fri Aug 9 19:51:52 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 2.32.2+20180228.6a7dbfb9: + + Updated translations. +- Update git url in _service to current archive in gitlab.gnome.org +- Align with what configure checks for: + + Drop gconf2-devel, gnome-vfs2-devel, gtk2-devel and + libbonobo-devel BuildRequires. + + Add pkgconfig(gconf-2.0), pkgconfig(glib-2.0), + pkgconfig(gmodule-2.0), pkgconfig(gnome-vfs-2.0), + pkgconfig(gobject-2.0) and pkgconfig(libbonobo-2.0) + BuildRequires. +- Drop explicit Requires from devel-subpackage: audiofile-devel, + gconf2-devel, glib2-devel, glibc-devel, gnome-vfs2-devel, + libbonobo-devel, orbit2-devel and popt-devel. +- Pass enable-canberra=no to configure and drop libcanberra-devel + BuildRequires: no longer depend on optional libcanberra. +- Rebase patches with quilt, enable libgnome-help-bundles.patch. +- Drop translation-update-upstream BuildRequires and macro: SUSE no + longer provides translations for this. +- Use modern macros. + +------------------------------------------------------------------- Old: ---- libgnome-2.32.2+20170910.8487c2b4.tar.xz New: ---- libgnome-2.32.2+20180228.6a7dbfb9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnome.spec ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.615055329 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.619055328 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgnome # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,40 +12,42 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libgnome -Version: 2.32.2+20170910.8487c2b4 +Version: 2.32.2+20180228.6a7dbfb9 Release: 0 Summary: The GNOME 2.x Desktop Base Libraries License: LGPL-2.1-or-later Group: Development/Libraries/GNOME -URL: http://www.gnome.org/ +URL: https://www.gnome.org/ + # Source based on tar_scm _service Source: %{name}-%{version}.tar.xz -#Source: http://ftp.gnome.org/pub/GNOME/sources/%%{name}/2.32/%%{name}-%%{version}.tar.bz2 Source99: baselibs.conf + # PATCH-FIX-OPENSUSE libgnome-sounds-default.diff -- Set default sounds for events -Patch4: libgnome-sounds-default.patch +Patch0: libgnome-sounds-default.patch # PATCH-FIX-UPSTREAM libgnome-uninitialized-vars.patch bgo543570 -Patch6: libgnome-uninitialized-vars.patch +Patch1: libgnome-uninitialized-vars.patch # PATCH-FIX-UPSTREAM libgnome-va_list-empty.patch bgo543570 -- This fixes the same as libgnome-uninitialized-vars.patch, so both can go away when upstream accepts patc -Patch8: libgnome-va_list-empty.patch -# PATCH-NEEDS-REBASE libgnome-help-bundles.patch -- was: PATCH-FIX-OPENSUSE -Patch9: libgnome-help-bundles.patch +Patch2: libgnome-va_list-empty.patch +# PATCH-FIX-OPENSUSE libgnome-help-bundles.patch +Patch3: libgnome-help-bundles.patch + BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: gnome-common -BuildRequires: gnome-vfs2-devel BuildRequires: gtk-doc -BuildRequires: gtk2-devel BuildRequires: intltool -BuildRequires: libbonobo-devel -BuildRequires: libcanberra-devel BuildRequires: pkgconfig -BuildRequires: translation-update-upstream +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gnome-vfs-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(libbonobo-2.0) Recommends: %{name}-lang = %{version} # # A bunch of legacy gnome apps relies more or less on yelp for a working help system (it can be reconfigured). Thus we recommend yelp from here, as low in the stack as it makes sense. @@ -60,22 +62,13 @@ %package devel Summary: Development files for libgnome -Group: Development/Libraries/GNOME #FIXME: major bloat, should be only #Requires: libbonobo-devel # +Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: audiofile-devel -Requires: gconf2-devel -Requires: glib2-devel -Requires: glibc-devel -Requires: gnome-vfs2-devel -Requires: libbonobo-devel -Requires: orbit2-devel -Requires: popt-devel Provides: libgnome-doc = %{version} Obsoletes: libgnome-doc < %{version} -# %description devel This subpackage contains the header files for developing @@ -84,25 +77,21 @@ %lang_package %prep -%setup -q -translation-update-upstream -%patch4 -%patch6 -%patch8 -p1 -# Needs rebase -#patch9 -p1 +%autosetup -p1 %build NOCONFIGURE=1 ./autogen.sh %configure \ --disable-esd \ + --enable-canberra=no \ --enable-gtk-doc \ --disable-static \ %{nil} -make %{?_smp_mflags} +%make_build %install %make_install + mkdir -p %{buildroot}/%{_datadir}/gnome/help %{buildroot}/%{_datadir}/gnome/autostart %find_lang %{name}-2.0 %find_gconf_schemas @@ -133,7 +122,7 @@ %{_libdir}/*.*so.* %{_libdir}/bonobo/monikers/*.so %{_libdir}/bonobo/servers/* -%{_mandir}/man7/gnome-options.7%{ext_man} +%{_mandir}/man7/gnome-options.7%{?ext_man} # generic directory for sound events %dir %{_sysconfdir}/sound %dir %{_sysconfdir}/sound/events ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.647055320 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.647055320 +0200 @@ -1,6 +1,6 @@ <services> <service mode="disabled" name="tar_scm"> - <param name="url">git://git.gnome.org/libgnome</param> + <param name="url">https://gitlab.gnome.org/Archive/libgnome.git</param> <param name="scm">git</param> <param name="versionformat">2.32.2+%cd.%h</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.659055317 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.659055317 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> - <param name="url">git://git.gnome.org/libgnome</param> - <param name="changesrevision">8487c2b45f55880bf4d805a3ee57127286850deb</param></service></servicedata> \ No newline at end of file + <param name="url">https://gitlab.gnome.org/Archive/libgnome.git</param> + <param name="changesrevision">6a7dbfb91a1000d7c60c4f0ff8fc7f6d390a4bc0</param></service></servicedata> \ No newline at end of file ++++++ libgnome-2.32.2+20170910.8487c2b4.tar.xz -> libgnome-2.32.2+20180228.6a7dbfb9.tar.xz ++++++ ++++ 1797 lines of diff (skipped) ++++++ libgnome-help-bundles.patch ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.887055251 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.887055251 +0200 @@ -1,7 +1,8 @@ -diff -upr libgnome-2.19.1-pre/libgnome/gnome-help.c libgnome-2.19.1-post/libgnome/gnome-help.c ---- libgnome-2.19.1-pre/libgnome/gnome-help.c 2007-06-19 16:04:29.000000000 -0500 -+++ libgnome-2.19.1-post/libgnome/gnome-help.c 2007-09-14 12:27:12.000000000 -0500 -@@ -126,9 +126,11 @@ gnome_help_display_with_doc_id_and_env ( +Index: libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-help.c +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/libgnome/gnome-help.c ++++ libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-help.c +@@ -123,9 +123,11 @@ gnome_help_display_with_doc_id_and_env ( { gchar *local_help_path; gchar *global_help_path; @@ -13,7 +14,7 @@ gchar *uri; gchar *free_doc_id = NULL; gboolean retval; -@@ -184,6 +186,14 @@ gnome_help_display_with_doc_id_and_env ( +@@ -181,6 +183,14 @@ gnome_help_display_with_doc_id_and_env ( goto out; } @@ -28,7 +29,7 @@ /* Try to access the help paths, first the app-specific help path * and then falling back to the global help path if the first one fails. */ -@@ -213,6 +223,16 @@ gnome_help_display_with_doc_id_and_env ( +@@ -210,6 +220,16 @@ gnome_help_display_with_doc_id_and_env ( global_help_path); goto out; } @@ -45,7 +46,7 @@ } else { g_set_error (error, GNOME_HELP_ERROR, -@@ -227,6 +247,9 @@ gnome_help_display_with_doc_id_and_env ( +@@ -224,6 +244,9 @@ gnome_help_display_with_doc_id_and_env ( if (!(local_help_st.st_dev == global_help_st.st_dev && local_help_st.st_ino == global_help_st.st_ino)) file = locate_help_file (global_help_path, file_name); @@ -55,7 +56,7 @@ } if (file == NULL) { -@@ -329,6 +352,7 @@ gnome_help_display_desktop_with_env (Gno +@@ -326,6 +349,7 @@ gnome_help_display_desktop_with_env (Gno GError **error) { GSList *ret_locations, *li; @@ -63,7 +64,7 @@ char *file; gboolean retval; char *url; -@@ -346,6 +370,15 @@ gnome_help_display_desktop_with_env (Gno +@@ -343,6 +367,15 @@ gnome_help_display_desktop_with_env (Gno FALSE /* only_if_exists */, &ret_locations); @@ -79,10 +80,11 @@ if (ret_locations == NULL) { g_set_error (error, GNOME_HELP_ERROR, -diff -upr libgnome-2.19.1-pre/libgnome/gnome-program.c libgnome-2.19.1-post/libgnome/gnome-program.c ---- libgnome-2.19.1-pre/libgnome/gnome-program.c 2007-09-14 11:41:34.000000000 -0500 -+++ libgnome-2.19.1-post/libgnome/gnome-program.c 2007-09-14 11:45:48.000000000 -0500 -@@ -994,6 +994,11 @@ gnome_program_locate_file (GnomeProgram +Index: libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/libgnome/gnome-program.c ++++ libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c +@@ -996,6 +996,11 @@ gnome_program_locate_file (GnomeProgram attr_rel = "/gnome/help"; search_path = FALSE; break; @@ -94,9 +96,10 @@ default: g_warning (G_STRLOC ": unknown file domain %u", domain); return NULL; -diff -upr libgnome-2.19.1-pre/libgnome/gnome-program.h libgnome-2.19.1-post/libgnome/gnome-program.h ---- libgnome-2.19.1-pre/libgnome/gnome-program.h 2007-09-14 11:41:34.000000000 -0500 -+++ libgnome-2.19.1-post/libgnome/gnome-program.h 2007-09-14 11:46:22.000000000 -0500 +Index: libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.h +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/libgnome/gnome-program.h ++++ libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.h @@ -70,7 +70,9 @@ typedef enum { GNOME_FILE_DOMAIN_APP_SOUND, GNOME_FILE_DOMAIN_APP_PIXMAP, @@ -108,14 +111,3 @@ } GnomeFileDomain; struct _GnomeProgram -diff -upr libgnome-2.19.1-pre/libgnome/libgnometypebuiltins.c libgnome-2.19.1-post/libgnome/libgnometypebuiltins.c ---- libgnome-2.19.1-pre/libgnome/libgnometypebuiltins.c 2007-07-30 10:13:43.000000000 -0500 -+++ libgnome-2.19.1-post/libgnome/libgnometypebuiltins.c 2007-09-14 11:47:03.000000000 -0500 -@@ -42,6 +42,7 @@ static const GEnumValue _gnome_file_doma - { GNOME_FILE_DOMAIN_APP_PIXMAP, "GNOME_FILE_DOMAIN_APP_PIXMAP", "app-pixmap" }, - { GNOME_FILE_DOMAIN_APP_CONFIG, "GNOME_FILE_DOMAIN_APP_CONFIG", "app-config" }, - { GNOME_FILE_DOMAIN_APP_HELP, "GNOME_FILE_DOMAIN_APP_HELP", "app-help" }, -+ { GNOME_FILE_DOMAIN_HELP_BUNDLE, "GNOME_FILE_DOMAIN_HELP_BUNDLE", "help-bundle" }, - { 0, NULL, NULL } - }; - ++++++ libgnome-sounds-default.patch ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.891055250 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.891055250 +0200 @@ -1,6 +1,8 @@ ---- gnome-data/gnome-2.soundlist.in -+++ gnome-data/gnome-2.soundlist.in -@@ -10,21 +10,21 @@ +Index: libgnome-2.32.2+20170910.8487c2b4/gnome-data/gnome-2.soundlist.in +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/gnome-data/gnome-2.soundlist.in ++++ libgnome-2.32.2+20170910.8487c2b4/gnome-data/gnome-2.soundlist.in +@@ -10,21 +10,21 @@ file=shutdown1.wav _description=Log out [info] @@ -27,8 +29,10 @@ -file=generic.wav +file= _description=Miscellaneous message ---- gnome-data/gtk-events-2.soundlist.in -+++ gnome-data/gtk-events-2.soundlist.in +Index: libgnome-2.32.2+20170910.8487c2b4/gnome-data/gtk-events-2.soundlist.in +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/gnome-data/gtk-events-2.soundlist.in ++++ libgnome-2.32.2+20170910.8487c2b4/gnome-data/gtk-events-2.soundlist.in @@ -2,13 +2,13 @@ _description=User interface events ++++++ libgnome-uninitialized-vars.patch ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.899055248 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.899055248 +0200 @@ -1,6 +1,8 @@ ---- libgnome/gnome-program.c -+++ libgnome/gnome-program.c -@@ -1999,9 +1999,9 @@ +Index: libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c +=================================================================== +--- libgnome-2.32.2+20170910.8487c2b4.orig/libgnome/gnome-program.c ++++ libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c +@@ -2137,9 +2137,9 @@ gnome_program_init_paramv (GType type, int argc, char **argv, guint nparams, GParameter *params) { ++++++ libgnome-va_list-empty.patch ++++++ --- /var/tmp/diff_new_pack.QJt0MF/_old 2019-08-13 20:44:40.903055246 +0200 +++ /var/tmp/diff_new_pack.QJt0MF/_new 2019-08-13 20:44:40.907055245 +0200 @@ -4,11 +4,11 @@ libgnome/gnome-program.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -Index: libgnome-2.16.0/libgnome/gnome-program.c +Index: libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c =================================================================== ---- libgnome-2.16.0.orig/libgnome/gnome-program.c -+++ libgnome-2.16.0/libgnome/gnome-program.c -@@ -1992,6 +1992,19 @@ gnome_program_initv (GType type, +--- libgnome-2.32.2+20170910.8487c2b4.orig/libgnome/gnome-program.c ++++ libgnome-2.32.2+20170910.8487c2b4/libgnome/gnome-program.c +@@ -2130,6 +2130,19 @@ gnome_program_initv (GType type, * * Since: 2.8 */ @@ -28,7 +28,7 @@ GnomeProgram* gnome_program_init_paramv (GType type, const char *app_id, const char *app_version, -@@ -1999,9 +2012,5 @@ gnome_program_init_paramv (GType type, +@@ -2137,9 +2150,5 @@ gnome_program_init_paramv (GType type, int argc, char **argv, guint nparams, GParameter *params) {
