Accepting request 108750 from home:dimstar:branches:GNOME:Apps

Update to 0.9.0

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

gnote-0.8.2.tar.xz

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

gnote-0.9.0.tar.xz

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

gnote-buildfix.patch

@@ -0,0 +1,25 @@
+From d0e06bcc294330ccd83c60d54b56bc5741160ce5 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sat, 10 Mar 2012 19:50:32 +0100
+Subject: [PATCH] Fix missing header includes for Glib::TimeoutSource. Fixes
+ bug 671787.
+
+---
+ src/synchronization/syncmanager.hpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/synchronization/syncmanager.hpp b/src/synchronization/syncmanager.hpp
+index 19b87dd..6506ed1 100644
+--- a/src/synchronization/syncmanager.hpp
++++ b/src/synchronization/syncmanager.hpp
+@@ -26,6 +26,7 @@
+ #include <map>
+ #include <string>
+ 
++#include <glibmm/main.h>
+ #include <glibmm/thread.h>
+ 
+ #include "note.hpp"
+-- 
+1.7.9.2
+

gnote-new-glibmm.patch

@@ -1,20 +0,0 @@
-From 7364a6fd55c46db5c5dbae6df6ac377d48919fa9 Mon Sep 17 00:00:00 2001
-From: Hub Figuiere <hub@figuiere.net>
-Date: Fri, 06 Jan 2012 05:19:49 +0000
-Subject: Fix missing header for Glib::signal_idle. Closes #667349
-
----
-diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp
-index 48bca2d..df223f3 100644
---- a/src/notebuffer.cpp
-+++ b/src/notebuffer.cpp
-@@ -23,6 +23,7 @@
- #include <algorithm>
- #include <tr1/array>
- 
-+#include <glibmm/main.h>
- 
- #include "debug.hpp"
- #include "notebuffer.hpp"
---
-cgit v0.9.0.2

gnote.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sat Mar 10 18:28:58 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 0.9.0:
+  + New Features:
+    - Added core synchronization support
+    - Added addin to synchronize with local folder.
+  + Fixes:
+    - Fix missing header for Glib::signal_idle (bgo#667349)
+    - Call startup defined in GApplication
+    - Remove mnemonic references in documentation (bgo#670916)
+    - Fix selection deletion and remembering it
+    - Fix quit application for glib >= 2.32
+  + Updated translations.
+- Remove xz BuildRequires now that it comes for free in the build
+  system.
+- Drop gnote-new-glibmm.patch: fixed upstream.
+- Add gnote-buildfix.patch: Fix build by incuding missing headers.
+
 -------------------------------------------------------------------
 Fri Jan  6 14:11:23 UTC 2012 - vuntz@opensuse.org
 

gnote.spec

@@ -15,16 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           gnote
-Version:        0.8.2
+Version:        0.9.0
 Release:        0
 Summary:        A Port of Tomboy to C++
 License:        GPL-3.0+
 Group:          Productivity/Text/Editors
 Url:            http://live.gnome.org/Gnote
-Source:         http://download.gnome.org/sources/gnote/0.8/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnote/0.9/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gnote-new-glibmm.patch bgo#667349 vuntz@opensuse.org -- Fix build with recent versions of glibmm; taken from git
+# PATCH-FIX-UPSTREAM gnote-buildfix.patch bgo#671787 dimstar@opensuse.org -- Fix build by including missing headers.
-Patch0:         gnote-new-glibmm.patch
+Patch0:         gnote-buildfix.patch
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -36,8 +37,6 @@ BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  pcre-devel
 BuildRequires:  update-desktop-files
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(libpanelapplet-4.0) >= 3.0
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +57,7 @@ V=1 make %{?_smp_mflags}
 
 %install
 %make_install
+find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 %suse_update_desktop_file gnote     Utility  DesktopUtility
 %find_lang %{name} %{?no_lang_C}
 
@@ -89,6 +89,9 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
 %{_bindir}/gnote
 %{_libexecdir}/gnote-applet
 %{_libdir}/gnote/
+# Splitting does not make sense as it's just a lib for gnote itself (and it's plugins)
+%{_libdir}/libgnote-0.9.so*
+%{_libdir}/libgnote.so
 %{_datadir}/applications/gnote.desktop
 %{_datadir}/dbus-1/services/org.gnome.Gnote.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.GnoteAppletFactory.service