Accepting request 589936 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/589936
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=108

gnote-3.26.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de205ace226a010aba576654db6a8e06eab064522549d3bdd6eb8a0bc9163be9
-size 3999368

gnote-3.28.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a50d3986c6cc04c7c8215dfed938910611e2d7499f00bfe4f42050ed56a7b783
+size 4002520

gnote.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Sun Mar 18 22:56:19 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.28.0:
+  + Fixes:
+    - Manual validation;
+    - gettext-domain in GSettings schema;
+    - Do not show empty actions menu (bgo#789750);
+    - Some shortcuts, that are added by context menu (bgo#792859).
+  + Updated manual.
+  + Updated translations.
+- Update URL tag to https://wiki.gnome.org/Apps/Gnote: currently
+  the Gnote's web page.
+- Drop:
+  + shortkey-ctrl-o-alt-w.patch: fixed upstream.
+  + update-desktop-files BuildRequires and suse_update_desktop_file
+    macro: they are no longer needed.
+- Add desktop-file-utils BuildRequires to avoid implicit
+  dependencies since the configure script checks for desktop-file-\
+  validate. It was already being pulled by update-desktop-files.
+- Conditionalize glib2_gsettings_schema_*, desktop_database_* and
+  icon_theme_cache_* post/postun scriptlets, and
+  glib2_gsettings_schema_require macro: they are needed only in
+  distro releases where RPM 4.13 is not present.
+- Point fdupes to the data directory instead of directly to the
+  build root, which is a practice that must be avoided.
+
 -------------------------------------------------------------------
 Wed Feb 28 16:30:25 UTC 2018 - dimstar@opensuse.org
 

gnote.spec

@@ -16,23 +16,21 @@
 #
 
 
-%define _gnote_version 3.26
+%define base_version 3.28
 Name:           gnote
-Version:        3.26.0
+Version:        3.28.0
 Release:        0
 Summary:        A Port of Tomboy to C++
 License:        GPL-3.0-or-later
 Group:          Productivity/Text/Editors
-URL:            http://live.gnome.org/Gnote
+URL:            https://wiki.gnome.org/Apps/Gnote
-Source:         http://download.gnome.org/sources/gnote/3.26/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnote/3.28/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM shortkey-ctrl-o-alt-w.patch bsc#1075335 bgo#792859 qzheng@suse.com -- When left-click the note tree view, shortkey should be enable.
+BuildRequires:  desktop-file-utils
-Patch0:         shortkey-ctrl-o-alt-w.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
-BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(glibmm-2.4) >= 2.32
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
@@ -43,11 +41,13 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(uuid)
 Recommends:     %{name}-lang
+%if 0%{?suse_version} < 1330
 %glib2_gsettings_schema_requires
+%endif
 %if 0%{?suse_version} > 1325
-BuildRequires:  libboost_test-devel
+BuildRequires:  libboost_test-devel >= 1.5.1
 %else
-BuildRequires:  boost-devel >= 1.34
+BuildRequires:  boost-devel >= 1.5.1
 %endif
 
 %description
@@ -72,7 +72,6 @@ search results from documents.
 
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build
@@ -82,39 +81,42 @@ make %{?_smp_mflags}
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file gnote     Utility  DesktopUtility
+desktop-file-edit --add-category TextEditor %{buildroot}%{_datadir}/applications/%{name}.desktop
-%fdupes %{buildroot}
+%fdupes %{buildroot}%{_datadir}
 %find_lang %{name} %{?no_lang_C}
 
 %post
 /sbin/ldconfig
+%if 0%{?suse_version} < 1330
 %glib2_gsettings_schema_post
 %desktop_database_post
 %icon_theme_cache_post
+%endif
 
 %postun
 /sbin/ldconfig
+%if 0%{?suse_version} < 1330
 %glib2_gsettings_schema_postun
 %desktop_database_postun
 %icon_theme_cache_postun
+%endif
 
 %files
 %license COPYING
+%doc AUTHORS NEWS README
 %doc %{_datadir}/help/C/%{name}/
 %{_bindir}/gnote
 %{_libdir}/gnote/
 # Splitting does not make sense as it's just a lib for gnote itself (and it's plugins)
-%{_libdir}/libgnote-%{_gnote_version}.so*
+%{_libdir}/libgnote-%{base_version}.so*
 %{_libdir}/libgnote.so
 %{_datadir}/applications/gnote.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml
 %{_datadir}/gnote/
 %{_datadir}/icons/hicolor/*/apps/gnote.*
-%{_mandir}/man1/gnote.1*
+%{_mandir}/man1/gnote.1%{?ext_man}
-%dir %{_datadir}/appdata/
+%dir %{_datadir}/metainfo/
-%{_datadir}/appdata/gnote.appdata.xml
+%{_datadir}/metainfo/gnote.appdata.xml
-
-%files lang -f %{name}.lang
 
 %files -n gnome-shell-search-provider-%{name}
 %{_datadir}/dbus-1/services/org.gnome.Gnote.service
@@ -122,4 +124,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %dir %{_datadir}/gnome-shell/search-providers
 %{_datadir}/gnome-shell/search-providers/gnote-search-provider.ini
 
+%files lang -f %{name}.lang
+
 %changelog

shortkey-ctrl-o-alt-w.patch

@@ -1,21 +0,0 @@
-diff --git a/src/searchnoteswidget.cpp b/src/searchnoteswidget.cpp
-index 9aa7bed..1186158 100644
---- a/src/searchnoteswidget.cpp
-+++ b/src/searchnoteswidget.cpp
-@@ -946,6 +946,8 @@ bool SearchNotesWidget::on_treeview_button_released(GdkEventButton *ev)
- 
- bool SearchNotesWidget::on_treeview_key_pressed(GdkEventKey * ev)
- {
-+  Gtk::Menu *menu = get_note_list_context_menu();
-+
-   switch(ev->keyval) {
-   case GDK_KEY_Delete:
-     delete_selected_notes();
-@@ -955,7 +957,6 @@ bool SearchNotesWidget::on_treeview_key_pressed(GdkEventKey * ev)
-     // Pop up the context menu if a note is selected
-     Note::List selected_notes = get_selected_notes();
-     if(!selected_notes.empty()) {
--      Gtk::Menu *menu = get_note_list_context_menu();
-       popup_context_menu_at_location(menu, 0, 0);
-     }
-     break;