.gitignore

@@ -1 +1 @@
-SOURCES/gnome-logs-3.28.5.tar.xz
+SOURCES/gnome-logs-3.36.0.tar.xz

.gnome-logs.metadata

@@ -1 +1 @@
-7ab15d2ac878dcdadab1b38b238c3bb87f42f83f SOURCES/gnome-logs-3.28.5.tar.xz
+de2e342d25a07b3ce5d23482b93db7fb5c078f60 SOURCES/gnome-logs-3.36.0.tar.xz

SOURCES/0001-gl-application.c-add-four-shortcuts.patch

@@ -0,0 +1,101 @@
+From 8b7f222e75d006cc3573c9b545c26d6fac56b5ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
+Date: Fri, 3 Apr 2020 15:09:26 +0300
+Subject: [PATCH 1/2] gl-application.c: add four shortcuts
+
+F1: Help
+Ctrl+E: Export
+Ctrl+N: New window
+Ctrl+question: Keyboard shortcuts
+---
+ src/gl-application.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/gl-application.c b/src/gl-application.c
+index c20052c..b2ef1f7 100644
+--- a/src/gl-application.c
++++ b/src/gl-application.c
+@@ -178,67 +178,80 @@ on_monospace_font_name_changed (GSettings *settings,
+     }
+ }
+ 
+ static GActionEntry actions[] = {
+     { "new-window", on_new_window },
+     { "help", on_help },
+     { "about", on_about }
+ };
+ 
+ static void
+ gl_application_startup (GApplication *application)
+ {
+     g_action_map_add_action_entries (G_ACTION_MAP (application), actions,
+                                      G_N_ELEMENTS (actions), application);
+ 
+     /* Calls gtk_init() with no arguments. */
+     G_APPLICATION_CLASS (gl_application_parent_class)->startup (application);
+ 
+     /* gtk_init() calls setlocale(), so gettext must be called after that. */
+     g_set_application_name (_(PACKAGE_NAME));
+     gtk_window_set_default_icon_name (PACKAGE_TARNAME);
+ }
+ 
+ static void
+ gl_application_activate (GApplication *application)
+ {
+     GtkWidget *window;
+     GlApplicationPrivate *priv;
+     const gchar * const close_accel[] = { "<Primary>w", NULL };
+     const gchar * const search_accel[] = { "<Primary>f", NULL };
++    const gchar * const export_accel[] = { "<Primary>e", NULL };
++    const gchar * const help_accel[] = { "F1", NULL };
++    const gchar * const new_window_accel[] = { "<Primary>n", NULL };
++    const gchar * const help_overlay_accel[] = { "<Primary>question", NULL };
+ 
+     window = gl_window_new (GTK_APPLICATION (application));
+     gtk_widget_show (window);
+     gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+                                            "win.close", close_accel);
+     gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+                                            "win.search", search_accel);
++    gtk_application_set_accels_for_action (GTK_APPLICATION (application),
++                                           "win.export", export_accel);
++    gtk_application_set_accels_for_action (GTK_APPLICATION (application),
++                                           "app.help", help_accel);
++    gtk_application_set_accels_for_action (GTK_APPLICATION (application),
++                                           "app.new-window", new_window_accel);
++    gtk_application_set_accels_for_action (GTK_APPLICATION (application),
++                                           "win.show-help-overlay",
++                                           help_overlay_accel);
+ 
+     priv = gl_application_get_instance_private (GL_APPLICATION (application));
+ 
+     on_monospace_font_name_changed (priv->desktop, DESKTOP_MONOSPACE_FONT_NAME,
+                                     priv);
+ }
+ 
+ static const GOptionEntry options[] =
+ {
+     { "version", 'v', 0, G_OPTION_ARG_NONE, NULL,
+       N_("Print version information and exit"), NULL },
+     { NULL }
+ };
+ 
+ static gint
+ gl_application_handle_local_options (GApplication *application,
+                                      GVariantDict *options)
+ {
+     if (g_variant_dict_contains (options, "version"))
+     {
+         g_print ("%s - Version %s\n", g_get_application_name (), PACKAGE_VERSION);
+         return 0;
+     }
+ 
+     return -1;
+ }
+ 
+ static void
+ gl_application_finalize (GObject *object)
+ {
+-- 
+2.35.1
+

SOURCES/0001-gl-window-Set-default-width-height.patch

@@ -0,0 +1,55 @@
+From ef4c13a2ec49d94495370bcdb0870252ba43bfd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 27 Jul 2021 11:35:09 +0200
+Subject: [PATCH] gl-window: Set default-{width,height}
+
+Instead of limiting the minimal size rather make those values the
+default so the window can shring to smaller sizes on e.g. phones.
+---
+ data/gl-window.ui | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/gl-window.ui b/data/gl-window.ui
+index e20569d..28e3fc8 100644
+--- a/data/gl-window.ui
++++ b/data/gl-window.ui
+@@ -1,34 +1,34 @@
+ <interface domain="gnome-logs">
+     <template class="GlWindow" parent="GtkApplicationWindow">
+-        <property name="height-request">780</property>
+-        <property name="width-request">1200</property>
++        <property name="default-width">1200</property>
++        <property name="default-height">600</property>
+         <signal name="key-press-event" handler="on_gl_window_key_press_event"/>
+         <child type="titlebar">
+             <object class="GlEventToolbar" id="event_toolbar">
+             </object>
+         </child>
+         <child>
+             <object class="GtkBox" id="event_box">
+                 <property name="orientation">vertical</property>
+                 <property name="visible">True</property>
+                 <child>
+                     <object class="GtkInfoBar" id="info_bar">
+                         <property name="message-type">GTK_MESSAGE_ERROR</property>
+                         <child>
+                             <object class="GtkButtonBox" id="action_area">
+                                 <property name="visible">True</property>
+                                 <property name="orientation">horizontal</property>
+                                 <property name="layout_style">center</property>
+                                 <child>
+                                     <object class="GtkButton" id="help_button">
+                                         <property name="visible">True</property>
+                                         <property name="halign">center</property>
+                                         <property name="label" translatable="yes">Help</property>
+                                         <signal name="clicked" handler="on_help_button_clicked" object="GlWindow"/>
+                                     </object>
+                                 </child>
+                                 <child>
+                                     <object class="GtkButton" id="ignore_button">
+                                         <property name="visible">True</property>
+                                         <property name="halign">center</property>
+                                         <property name="label" translatable="yes">Ignore</property>
+-- 
+2.35.1
+

SOURCES/0002-help-overlay.ui-Add-three-shortcuts.patch

@@ -0,0 +1,84 @@
+From df0c7e7e2475c05acac5bb491788e72eb5b850cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
+Date: Fri, 3 Apr 2020 15:17:28 +0300
+Subject: [PATCH 2/2] help-overlay.ui: Add three shortcuts
+
+F1: Show help
+Ctrl+question: Keyboard shortcuts
+Ctrl+e: Export logs to a file
+---
+ data/help-overlay.ui | 23 ++++++++++++++++++++++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/data/help-overlay.ui b/data/help-overlay.ui
+index 881503e..4427e7c 100644
+--- a/data/help-overlay.ui
++++ b/data/help-overlay.ui
+@@ -1,42 +1,63 @@
+ <interface domain="gnome-logs">
+     <object class="GtkShortcutsWindow" id="help_overlay">
+         <child>
+             <object class="GtkShortcutsSection">
+                 <property name="visible">True</property>
+                 <child>
+                     <object class="GtkShortcutsGroup">
+                         <property name="title" translatable="yes" context="shortcut window">General</property>
+                         <property name="visible">True</property>
+                         <child>
+                             <object class="GtkShortcutsShortcut">
+                                 <property name="accelerator">&lt;Primary&gt;n</property>
+                                 <property name="title" translatable="yes" context="shortcut window">Open a new window</property>
+                                 <property name="visible">True</property>
+                             </object>
+                         </child>
+                         <child>
+                             <object class="GtkShortcutsShortcut">
+                                 <property name="accelerator">&lt;Primary&gt;w</property>
+                                 <property name="title" translatable="yes" context="shortcut window">Close a window</property>
+                                 <property name="visible">True</property>
+                             </object>
+                         </child>
++                        <child>
++                            <object class="GtkShortcutsShortcut">
++                                <property name="accelerator">F1</property>
++                                <property name="title" translatable="yes" context="shortcut window">Show help</property>
++                                <property name="visible">True</property>
++                            </object>
++                        </child>
++                        <child>
++                            <object class="GtkShortcutsShortcut">
++                                <property name="accelerator">&lt;Primary&gt;question</property>
++                                <property name="title" translatable="yes" context="shortcut window">Keyboard shorcuts</property>
++                                <property name="visible">True</property>
++                            </object>
++                        </child>
+                     </object>
+                 </child>
+                 <child>
+                     <object class="GtkShortcutsGroup">
+-                        <property name="title" translatable="yes" context="shortcut window">Search</property>
++                        <property name="title" translatable="yes" context="shortcut window">Application</property>
+                         <property name="visible">True</property>
+                         <child>
+                             <object class="GtkShortcutsShortcut">
+                                 <property name="accelerator">&lt;Primary&gt;f</property>
+                                 <property name="title" translatable="yes" context="shortcut window">Find</property>
+                                 <property name="visible">True</property>
+                             </object>
+                         </child>
++                        <child>
++                            <object class="GtkShortcutsShortcut">
++                                <property name="accelerator">&lt;Primary&gt;e</property>
++                                <property name="title" translatable="yes" context="shortcut window">Export logs to a file</property>
++                                <property name="visible">True</property>
++                            </object>
++                        </child>
+                     </object>
+                 </child>
+             </object>
+         </child>
+     </object>
+ </interface>
+-- 
+2.35.1
+

SOURCES/gnome-logs-3.28.5-timestamp-crash-fix.patch

@@ -1,27 +0,0 @@
-From 7d0062a4ab36d457b74fe17b8d494570d4a0334b Mon Sep 17 00:00:00 2001
-From: David King <davidk@gnome.org>
-Date: Mon, 11 Feb 2019 08:46:08 +0000
-Subject: [PATCH] Avoid segfault when updating latest timestamp
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1652642
----
- src/gl-journal.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/gl-journal.c b/src/gl-journal.c
-index 4edb1a6..26815cb 100644
---- a/src/gl-journal.c
-+++ b/src/gl-journal.c
-@@ -94,8 +94,7 @@ gl_journal_update_latest_timestamp (GlJournal *journal)
-         g_warning ("Error retrieving the sender timestamps: %s",
-                    g_strerror (-r));
-     }
--
--    if (realtime > boot_id->realtime_last)
-+    else if (realtime > boot_id->realtime_last)
-     {
-         boot_id->realtime_last = realtime;
-     }
--- 
-2.20.1
-

SPECS/gnome-logs.spec

@@ -1,80 +1,138 @@
 Name:           gnome-logs
-Version:        3.28.5
+Version:        3.36.0
-Release:        3%{?dist}
+Release:        8%{?dist}
 Summary:        Log viewer for the systemd journal
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Logs
-Source0:        https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1652642
-Patch0:         gnome-logs-3.28.5-timestamp-crash-fix.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtds
 BuildRequires:  docbook-style-xsl
-BuildRequires:  gnome-common
+BuildRequires:  gcc
-BuildRequires:  intltool
+BuildRequires:  git
+BuildRequires:  itstool
 BuildRequires:  libxslt
+BuildRequires:  meson
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  /usr/bin/appstream-util
-BuildRequires:  python3-devel
 Requires:       gsettings-desktop-schemas
 
+Patch10001: 0001-gl-application.c-add-four-shortcuts.patch
+Patch10002: 0002-help-overlay.ui-Add-three-shortcuts.patch
+
+Patch20001: 0001-gl-window-Set-default-width-height.patch
+
 %description
 A log viewer for the systemd journal.
 
 %prep
-%setup -q
+%autosetup -S git
-%patch0 -p1
 
 
 %build
-%configure
+%meson -Dman=true
-make V=1 %{?_smp_mflags}
+%meson_build
 
 
 %install
-%make_install
+%meson_install
 %find_lang %{name} --with-gnome
 
 
 %check
-make check
+%meson_test
 
 
 %files -f %{name}.lang
 %doc AUTHORS README NEWS
 %license COPYING
 %{_bindir}/%{name}
-%{_metainfodir}/org.gnome.Logs.appdata.xml
+%{_datadir}/%{name}
 %{_datadir}/applications/org.gnome.Logs.desktop
 %{_datadir}/dbus-1/services/org.gnome.Logs.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Logs.*.xml
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Logs.svg
-%{_datadir}/icons/hicolor/symbolic/apps/%{name}-symbolic.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Logs-symbolic.svg
+%{_datadir}/metainfo/org.gnome.Logs.appdata.xml
 %{_mandir}/man1/gnome-logs.1*
 
 
 %changelog
-* Mon Feb 11 2019 David King <dking@redhat.com> - 3.28.5-3
+* Wed Jan 25 2023 Ray Strode <rstrode@redhat.com> - 3.36.0-8
-- Add fix for crash when updating timestamp (#1652642)
+- Fix window resizing
+  Resolves: #2035832
 
-* Mon Aug 13 2018 Ray Strode <rstrode@redhat.com> - 3.28.5-2
+* Wed Dec 14 2022 Ray Strode <rstrode@redhat.com> - 3.36.0-7
-- BuildRequires python3 binary
+- Fix shortcuts
-  Resolves: #1615525
+  Resolves: #2062860
 
-* Wed Jul 11 2018 David King <amigadave@amigadave.com> - 3.28.5-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-6
-- Update to 3.28.5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed Jul 11 2018 David King <amigadave@amigadave.com> - 3.28.4-1
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-5
-- Update to 3.28.4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Thu Jun 14 2018 David King <amigadave@amigadave.com> - 3.28.3-1
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
-- Update to 3.28.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Mon May 07 2018 David King <amigadave@amigadave.com> - 3.28.2-1
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
-- Update to 3.28.2
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 12 2020 David King <amigadave@amigadave.com> - 3.36.0-1
+- Update to 3.36.0 (#1834692)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Sep 10 2019 David King <amigadave@amigadave.com> - 3.34.0-1
+- Update to 3.34.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 20 2019 David King <amigadave@amigadave.com> - 3.33.2-1
+- Update to 3.33.2
+
+* Tue Apr 23 2019 David King <amigadave@amigadave.com> - 3.33.1-1
+- Update to 3.33.1 (#1702129)
+
+* Mon Apr 08 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
+- Update to 3.32.1
+
+* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
+- Update to 3.32.0
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 David King <amigadave@amigadave.com> - 3.31.4-1
+- Update to 3.31.4
+
+* Mon Dec 10 2018 David King <amigadave@amigadave.com> - 3.31.3-1
+- Update to 3.31.3
+
+* Mon Nov 12 2018 David King <amigadave@amigadave.com> - 3.31.2-1
+- Update to 3.31.2
+
+* Mon Sep 03 2018 David King <amigadave@amigadave.com> - 3.30.0-1
+- Update to 3.30.0
+
+* Tue Jul 17 2018 David King <amigadave@amigadave.com> - 3.29.4-1
+- Update to 3.29.4 (#1601640)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.29.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Apr 17 2018 David King <amigadave@amigadave.com> - 3.29.1-1
+- Update to 3.29.1 (#1568395)
 
 * Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
 - Update to 3.28.0