From dbca4405a4ba73f80d4752b2e14c2777f3f5a13564656c9c4f3688f999fd2927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 2 Nov 2021 13:10:56 +0000 Subject: [PATCH] Accepting request 928404 from GNOME:Next - Update to version 41.1: + Bugs fixed: - Fix search box focus when very first search in window is in note. - Fix note always re-opening in new window. + Updated translations. - Drop 2a6b5aa.patch: Fixed upstream. - Replace post(un) handling with new ldconfig_scriptlets macro. - Replace gcc-c++ with generic c++_compiler BuildRequires. - Update Supplements to current standard. - Remove a filter from rpmlintrc, no longer needed and now gives a warning, remove it to silence rpmlintrc. OBS-URL: https://build.opensuse.org/request/show/928404 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=146 --- 2a6b5aa.patch | 26 -------------------------- gnote-41.0.tar.xz | 3 --- gnote-41.1.tar.xz | 3 +++ gnote-rpmlintrc | 2 -- gnote.changes | 16 ++++++++++++++++ gnote.spec | 16 +++++++--------- 6 files changed, 26 insertions(+), 40 deletions(-) delete mode 100644 2a6b5aa.patch delete mode 100644 gnote-41.0.tar.xz create mode 100644 gnote-41.1.tar.xz diff --git a/2a6b5aa.patch b/2a6b5aa.patch deleted file mode 100644 index a4fce0c..0000000 --- a/2a6b5aa.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2a6b5aa4a5ebc1390854e252a6129203f2fad47c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Aurimas=20=C4=8Cernius?= -Date: Sun, 3 Oct 2021 21:05:37 +0300 -Subject: [PATCH] Fix search box focus when very first search in window is in - note. - -Fixes https://gitlab.gnome.org/GNOME/gnote/-/issues/108 ---- - src/recentchanges.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp -index e2a0847b..34ef6d4f 100644 ---- a/src/recentchanges.cpp -+++ b/src/recentchanges.cpp -@@ -258,7 +258,6 @@ namespace gnote { - m_search_box->set_hexpand(false); - m_search_box->attach(*m_search_entry, 0, 0, 1, 1); - m_search_box->set_halign(Gtk::ALIGN_CENTER); -- m_search_box->show(); - - auto content = dynamic_cast(m_embed_box.get_parent()); - if(content) { --- -GitLab - diff --git a/gnote-41.0.tar.xz b/gnote-41.0.tar.xz deleted file mode 100644 index 36740ee..0000000 --- a/gnote-41.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffd1aed8a332a6031800590b914433445bc582e435abbef1d771e210143a3200 -size 3164592 diff --git a/gnote-41.1.tar.xz b/gnote-41.1.tar.xz new file mode 100644 index 0000000..50fceb1 --- /dev/null +++ b/gnote-41.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58db2cad13b44167a9efa1544103526c67e6efaa86dafb3a314ea142950e2162 +size 3166996 diff --git a/gnote-rpmlintrc b/gnote-rpmlintrc index b01f4f6..99d51b3 100644 --- a/gnote-rpmlintrc +++ b/gnote-rpmlintrc @@ -1,4 +1,2 @@ -# Filter shared library policy missing suffix as we don't want to split the package at the moment: -addFilter("gnote.* shlib-policy-missing-suffix") # Filter devel file in non devel package as splitting out a devel package is not needed, internal gnote use only. addFilter("gnote.* devel-file-in-non-devel-package") diff --git a/gnote.changes b/gnote.changes index 3e7ffb9..dc96a50 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Oct 31 16:40:25 UTC 2021 - Bjørn Lie + +- Update to version 41.1: + + Bugs fixed: + - Fix search box focus when very first search in window is in + note. + - Fix note always re-opening in new window. + + Updated translations. +- Drop 2a6b5aa.patch: Fixed upstream. +- Replace post(un) handling with new ldconfig_scriptlets macro. +- Replace gcc-c++ with generic c++_compiler BuildRequires. +- Update Supplements to current standard. +- Remove a filter from rpmlintrc, no longer needed and now gives a + warning, remove it to silence rpmlintrc. + ------------------------------------------------------------------- Mon Oct 4 08:12:17 UTC 2021 - Dominique Leuenberger diff --git a/gnote.spec b/gnote.spec index 85bd631..ed3c414 100644 --- a/gnote.spec +++ b/gnote.spec @@ -19,7 +19,7 @@ %define base_version 41 Name: gnote -Version: 41.0 +Version: 41.1 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0-or-later @@ -27,11 +27,10 @@ Group: Productivity/Text/Editors URL: https://wiki.gnome.org/Apps/Gnote Source0: https://download.gnome.org/sources/gnote/41/%{name}-%{version}.tar.xz Source99: gnote-rpmlintrc -# PATCH-FIX-UPSTREAM 2a6b5aa.patch boo#1191141 dimstar@opensuse.org -- Fix search box focus when very first search in window is in note. -Patch0: https://gitlab.gnome.org/GNOME/gnote/-/commit/2a6b5aa.patch + +BuildRequires: c++_compiler BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: libboost_test-devel >= 1.5.1 BuildRequires: meson BuildRequires: pkgconfig @@ -54,7 +53,7 @@ Summary: Note editor for GNOME -- Search Provider for GNOME Shell Group: Productivity/Office/Other Requires: %{name} = %{version} Requires: gnome-shell -Supplements: packageand(%{name}:gnome-shell) +Supplements: (%{name} and gnome-shell) %description -n gnome-shell-search-provider-%{name} It is the same note taking application, including most of the add-ins (more are @@ -69,7 +68,8 @@ search results from documents. %autosetup -p1 %build -%meson +%meson \ + %{nil} %meson_build %install @@ -78,9 +78,7 @@ desktop-file-edit --add-category TextEditor %{buildroot}%{_datadir}/applications %fdupes %{buildroot}%{_datadir} %find_lang %{name} %{?no_lang_C} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING