From 063a0be21af6133d35a4d8c9fc3b8c8eafab34d9cbd4e9acc3169873fbea0136 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 2 Apr 2014 09:38:29 +0000
Subject: [PATCH] Accepting request 228529 from GNOME:Next

Might aswell push it since we have unstable 3.11 already

- Update to version 3.12.0:
  + New Features:
    - NoteDirectoryWatcher plugin interval is now configurable.
    - Import plugins are enabled by default and auto-disabled after
      import (bgo#723635).
    - Plugins are now checked for compatibility with Gnote.
  + Updated translations.
- Drop gnote-enable-tomboy-migration.patch: Fixed upstream.
- Bump soname following upstream changes.

OBS-URL: https://build.opensuse.org/request/show/228529
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=59
---
 gnote-3.11.1.tar.xz                 |  3 ---
 gnote-3.12.0.tar.xz                 |  3 +++
 gnote-enable-tomboy-migration.patch | 14 --------------
 gnote.changes                       | 15 ++++++++++++++-
 gnote.spec                          |  9 +++------
 5 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 gnote-3.11.1.tar.xz
 create mode 100644 gnote-3.12.0.tar.xz
 delete mode 100644 gnote-enable-tomboy-migration.patch

diff --git a/gnote-3.11.1.tar.xz b/gnote-3.11.1.tar.xz
deleted file mode 100644
index 8a1eda1..0000000
--- a/gnote-3.11.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:002493d1046e9d7292ae5cc5d3cf8a6f8fd54d3743313b47996f6af306de8627
-size 3054988
diff --git a/gnote-3.12.0.tar.xz b/gnote-3.12.0.tar.xz
new file mode 100644
index 0000000..60c09db
--- /dev/null
+++ b/gnote-3.12.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b76e13e6793d3e73adafaca20063ba9fea23dae67022597c69c81c1f61842d6c
+size 3078416
diff --git a/gnote-enable-tomboy-migration.patch b/gnote-enable-tomboy-migration.patch
deleted file mode 100644
index cce184a..0000000
--- a/gnote-enable-tomboy-migration.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Mike Gorse <mgorse@suse.com>
-Date: Wed Feb 12 08:32:51 CST 2014
-Subject: Enable Tomboy by default (bnc#862246)
-
-diff -ur gnote-3.11.0.orig/src/addins/tomboyimport/tomboyimport.desktop.in gnote-3.11.0/src/addins/tomboyimport/tomboyimport.desktop.in
---- gnote-3.11.0.orig/src/addins/tomboyimport/tomboyimport.desktop.in	2013-08-25 14:23:34.000000000 -0500
-+++ gnote-3.11.0/src/addins/tomboyimport/tomboyimport.desktop.in	2014-02-12 08:28:33.581091764 -0600
-@@ -5,5 +5,5 @@
- _Authors=Hubert Figuiere
- Category=Tools
- Version=0.2
--DefaultEnabled=false
-+DefaultEnabled=true
- Module=tomboyimport
diff --git a/gnote.changes b/gnote.changes
index 2ed306b..5b2f268 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,8 +1,21 @@
+-------------------------------------------------------------------
+Wed Mar 26 19:35:27 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 3.12.0:
+  + New Features:
+    - NoteDirectoryWatcher plugin interval is now configurable.
+    - Import plugins are enabled by default and auto-disabled after
+      import (bgo#723635).
+    - Plugins are now checked for compatibility with Gnote.
+  + Updated translations.
+- Drop gnote-enable-tomboy-migration.patch: Fixed upstream.
+- Bump soname following upstream changes.
+
 -------------------------------------------------------------------
 Wed Feb 12 16:39:23 UTC 2014 - mgorse@suse.com
 
 - Add gnote-enable-tomboy-migration.patch: enable Tomboy migration
-  by default (bnc#862246 bgo#723835).
+  by default (bnc#862246, bgo#723635).
 
 -------------------------------------------------------------------
 Sun Jan 19 14:43:57 UTC 2014 - dimstar@opensuse.org
diff --git a/gnote.spec b/gnote.spec
index f6246e1..485381e 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -17,15 +17,13 @@
 
 
 Name:           gnote
-Version:        3.11.1
+Version:        3.12.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/3.11/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-UPSTREAM gnote-enable-tomboy-migration.patch bnc#862246 bgo#723835 mgorse@suse.com -- enable Tomboy migration by default.
-Patch0:         gnote-enable-tomboy-migration.patch
+Source:         http://download.gnome.org/sources/gnote/3.12/%{name}-%{version}.tar.xz
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -66,7 +64,6 @@ search results from documents.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
 %configure --disable-static --with-x11-support
@@ -99,7 +96,7 @@ test %{buildroot} != "/" && rm -rf %{buildroot}
 %{_bindir}/gnote
 %{_libdir}/gnote/
 # Splitting does not make sense as it's just a lib for gnote itself (and it's plugins)
-%{_libdir}/libgnote-3.11.so*
+%{_libdir}/libgnote-3.12.so*
 %{_libdir}/libgnote.so
 %{_datadir}/applications/gnote.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml