Hello community, here is the log from the commit of package gnome-logs for openSUSE:Factory checked in at 2018-07-18 22:36:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-logs (Old) and /work/SRC/openSUSE:Factory/.gnome-logs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-logs" Wed Jul 18 22:36:02 2018 rev:30 rq:622307 version:3.28.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-logs/gnome-logs.changes 2018-06-22 13:27:05.309046020 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-logs.new/gnome-logs.changes 2018-07-18 22:36:07.474503967 +0200 @@ -1,0 +2,12 @@ +Wed Jul 11 17:57:27 UTC 2018 - bjorn....@gmail.com + +- Update to version 3.28.5: + + Fix typo in data/meson.build. +- Changes from version 3.28.4: + + Fix build error in meson build system. +- Switch to meson buildsystem, add meson BuildRequires and + corresponding macros. +- Add gnome-logs-fix-appdata-meson.patch: Fix appdata installfolder + when using meson build system. + +------------------------------------------------------------------- Old: ---- gnome-logs-3.28.3.tar.xz New: ---- gnome-logs-3.28.5.tar.xz gnome-logs-fix-appdata-meson.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-logs.spec ++++++ --- /var/tmp/diff_new_pack.RkEyEV/_old 2018-07-18 22:36:07.926502469 +0200 +++ /var/tmp/diff_new_pack.RkEyEV/_new 2018-07-18 22:36:07.930502456 +0200 @@ -18,17 +18,21 @@ Name: gnome-logs -Version: 3.28.3 +Version: 3.28.5 Release: 0 Summary: GNOME System Log Viewer License: GPL-3.0-or-later Group: System/X11/Utilities URL: https://wiki.gnome.org/Apps/Logs -Source: http://download.gnome.org/sources/gnome-logs/3.28/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-logs/3.28/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-logs-fix-appdata-meson.patch -- Fix appdata install folder when using meson build system +Patch0: gnome-logs-fix-appdata-meson.patch + BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xsltproc @@ -46,14 +50,17 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build -%configure -%make_build +%meson \ + -Dtests=false \ + -Dman=true \ + %{nil} +%meson_build %install -%make_install +%meson_install %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file -r org.gnome.Logs GTK GNOME System Monitor %fdupes %{buildroot}%{_datadir} @@ -64,6 +71,8 @@ %doc %{_datadir}/help/C/gnome-logs/ %{_bindir}/%{name} %{_datadir}/metainfo/org.gnome.Logs.appdata.xml +%dir %{_datadir}/gnome-logs +%{_datadir}/gnome-logs/gl-style.css %{_datadir}/applications/org.gnome.Logs.desktop %{_datadir}/glib-2.0/schemas/org.gnome.Logs.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Logs.gschema.xml ++++++ gnome-logs-3.28.3.tar.xz -> gnome-logs-3.28.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/ChangeLog new/gnome-logs-3.28.5/ChangeLog --- old/gnome-logs-3.28.3/ChangeLog 2018-06-14 09:55:46.000000000 +0200 +++ new/gnome-logs-3.28.5/ChangeLog 2018-07-11 16:03:50.000000000 +0200 @@ -1,6 +1,51 @@ +commit 1330a8bd43310a9a85db0deb262f71c643c5c5b4 +Author: Jonathan Kang <jonathank...@gnome.org> +Date: Wed Jul 11 22:02:33 2018 +0800 + + update NEWS for 3.28.5 release + +M NEWS +M configure.ac +M meson.build + +commit b73b85be709ad7c89e5699ceb740234f5b7f5a78 +Author: Bjørn Lie <bjorn....@gmail.com> +Date: Fri Jun 15 09:13:27 2018 +0000 + + Fix obvious typo + + Fix obvious typo gnoem-logs.1 to gnome-logs.1 + + (cherry picked from commit 02b782fcd64d4773e2dadbdb9ea74bf3923003b3) + +M data/meson.build + +commit 438c13c2896c600192625fdef7735c566ce51fe0 +Author: Jonathan Kang <jonathank...@gnome.org> +Date: Wed Jul 11 17:35:26 2018 +0800 + + update NEWS for 3.28.4 release + +M NEWS +M configure.ac +M meson.build + +commit 2f498464ac539fdf98199294bfb9205436b9c323 +Author: Jonathan Kang <jonathank...@gnome.org> +Date: Fri Jun 15 15:08:15 2018 +0800 + + meson: fix undefined function in meson_post_install.py + + join_paths() is a function defined in meson. Use os.path.join() + instead. + + (cherry picked from commit 59d2bf7b02607cc35c1b996080621fdeaeb29fcf) + +M meson_post_install.py + commit c4bc6b81591fa4e21ac6c83a60494d97dacd42c2 Author: Jonathan Kang <jonathank...@gnome.org> -Date: Thu Jun 14 15:46:42 2018 +0800 +Date: Thu Jun 14 15:46:42 2018 +0800 update NEWS for 3.28.3 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/NEWS new/gnome-logs-3.28.5/NEWS --- old/gnome-logs-3.28.3/NEWS 2018-06-14 09:54:05.000000000 +0200 +++ new/gnome-logs-3.28.5/NEWS 2018-07-11 16:00:36.000000000 +0200 @@ -1,3 +1,13 @@ +GNOME Logs 3.28.5 +================= + +* fix typo in data/meson.build + +GNOME Logs 3.28.4 +================= + +* fix build error in meson build system + GNOME Logs 3.28.3 ================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/configure new/gnome-logs-3.28.5/configure --- old/gnome-logs-3.28.3/configure 2018-06-14 09:54:40.000000000 +0200 +++ new/gnome-logs-3.28.5/configure 2018-07-11 16:03:17.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Logs 3.28.3. +# Generated by GNU Autoconf 2.69 for Logs 3.28.5. # # Report bugs to <dav...@gnome.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Logs' PACKAGE_TARNAME='gnome-logs' -PACKAGE_VERSION='3.28.3' -PACKAGE_STRING='Logs 3.28.3' +PACKAGE_VERSION='3.28.5' +PACKAGE_STRING='Logs 3.28.5' PACKAGE_BUGREPORT='dav...@gnome.org' PACKAGE_URL='https://wiki.gnome.org/Apps/Logs' @@ -1322,7 +1322,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Logs 3.28.3 to adapt to many kinds of systems. +\`configure' configures Logs 3.28.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1392,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Logs 3.28.3:";; + short | recursive ) echo "Configuration of Logs 3.28.5:";; esac cat <<\_ACEOF @@ -1521,7 +1521,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Logs configure 3.28.3 +Logs configure 3.28.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1701,7 +1701,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Logs $as_me 3.28.3, which was +It was created by Logs $as_me 3.28.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2570,7 +2570,7 @@ # Define the identity of the package. PACKAGE='gnome-logs' - VERSION='3.28.3' + VERSION='3.28.5' # Some tools Automake needs. @@ -8346,7 +8346,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Logs $as_me 3.28.3, which was +This file was extended by Logs $as_me 3.28.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8413,7 +8413,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Logs config.status 3.28.3 +Logs config.status 3.28.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/configure.ac new/gnome-logs-3.28.5/configure.ac --- old/gnome-logs-3.28.3/configure.ac 2018-06-14 09:54:05.000000000 +0200 +++ new/gnome-logs-3.28.5/configure.ac 2018-07-11 16:00:01.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([Logs], - [3.28.3], + [3.28.5], [dav...@gnome.org], [gnome-logs], [https://wiki.gnome.org/Apps/Logs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/data/meson.build new/gnome-logs-3.28.5/data/meson.build --- old/gnome-logs-3.28.3/data/meson.build 2018-06-05 12:57:52.000000000 +0200 +++ new/gnome-logs-3.28.5/data/meson.build 2018-07-11 15:59:17.000000000 +0200 @@ -88,7 +88,7 @@ if logs_enable_man custom_target('gl-manfile', input : 'gnome-logs.xml', - output : 'gnoem-logs.1', + output : 'gnome-logs.1', install : true, install_dir : gl_mandir, command : [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/meson.build new/gnome-logs-3.28.5/meson.build --- old/gnome-logs-3.28.3/meson.build 2018-06-14 09:54:05.000000000 +0200 +++ new/gnome-logs-3.28.5/meson.build 2018-07-11 16:00:04.000000000 +0200 @@ -1,4 +1,4 @@ -project('gnome-logs', 'c', version : '3.28.3') +project('gnome-logs', 'c', version : '3.28.5') gl_name = meson.project_name() gl_version = meson.project_version() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/meson_post_install.py new/gnome-logs-3.28.5/meson_post_install.py --- old/gnome-logs-3.28.3/meson_post_install.py 2018-06-05 12:57:52.000000000 +0200 +++ new/gnome-logs-3.28.5/meson_post_install.py 2018-06-15 09:34:02.000000000 +0200 @@ -3,10 +3,13 @@ import os import subprocess -schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') +install_prefix = os.environ['MESON_INSTALL_PREFIX'] +icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') +schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') if not os.environ.get('DESTDIR'): - print('Compiling gsettings schemas...') - subprocess.call(['glib-compile-schemas', join_paths(gl_datadir, 'glib-2.0', 'schemas')]) print('Updating icon cache...') - subprocess.call(['gtk-update-icon-cache --ignore-theme-index --force', join_paths(gl_datadir, 'icons', 'hicolor')]) + subprocess.call(['gtk-update-icon-cache', '--ignore-theme-index', '--force', icondir]) + + print('Compiling gsettings schemas...') + subprocess.call(['glib-compile-schemas', schemadir]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-logs-3.28.3/po/gnome-logs.pot new/gnome-logs-3.28.5/po/gnome-logs.pot --- old/gnome-logs-3.28.3/po/gnome-logs.pot 2018-06-14 09:55:36.000000000 +0200 +++ new/gnome-logs-3.28.5/po/gnome-logs.pot 2018-07-11 11:51:37.000000000 +0200 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gnome-logs 3.28.3\n" +"Project-Id-Version: gnome-logs 3.29.1\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "logs&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-06-14 15:55+0800\n" +"POT-Creation-Date: 2018-07-11 17:51+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -413,7 +413,7 @@ #. Translators: Shown when there are no (zero) results in the current #. * view. -#: src/gl-eventviewlist.c:478 +#: src/gl-eventviewlist.c:488 msgid "No results" msgstr "" @@ -595,18 +595,18 @@ msgid "log messages" msgstr "" -#: src/gl-window.c:175 +#: src/gl-window.c:181 msgid "Unable to export log messages to a file" msgstr "" -#: src/gl-window.c:440 src/gl-window.c:471 +#: src/gl-window.c:474 src/gl-window.c:505 msgid "Unable to read system logs" msgstr "" -#: src/gl-window.c:454 +#: src/gl-window.c:488 msgid "Unable to read user logs" msgstr "" -#: src/gl-window.c:486 +#: src/gl-window.c:520 msgid "No logs available" msgstr "" ++++++ gnome-logs-fix-appdata-meson.patch ++++++ --- gnome-logs-3.28.5-orig/data/meson.build 2018-07-11 15:59:17.000000000 +0200 +++ gnome-logs-3.28.5/data/meson.build 2018-07-11 20:17:55.477279107 +0200 @@ -18,7 +18,7 @@ output : 'org.gnome.Logs.appdata.xml', po_dir : 'po', install : true, - install_dir : join_paths(gl_datadir, 'appdata') + install_dir : join_paths(gl_datadir, 'metainfo') ) service_conf = configuration_data()
