From eadfa5b0decccae93a518a03cc3e8aa952a795738ade9d5a94f364d29e2fcd0e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 4 Jan 2012 13:17:52 +0000 Subject: [PATCH] Accepting request 98586 from home:vuntz:branches:GNOME:Apps Update to 0.8.2 OBS-URL: https://build.opensuse.org/request/show/98586 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=18 --- gnote-0.8.1.tar.bz2 | 3 -- gnote-0.8.2.tar.xz | 3 ++ gnote-buildfix.patch | 88 -------------------------------------------- gnote.changes | 31 ++++++++++++++++ gnote.spec | 18 ++++----- 5 files changed, 42 insertions(+), 101 deletions(-) delete mode 100644 gnote-0.8.1.tar.bz2 create mode 100644 gnote-0.8.2.tar.xz delete mode 100644 gnote-buildfix.patch diff --git a/gnote-0.8.1.tar.bz2 b/gnote-0.8.1.tar.bz2 deleted file mode 100644 index 289aeeb..0000000 --- a/gnote-0.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e03821c28a89368d1f30349540806450f1c360a74f0ef0c1ed25d591f3b97c0d -size 2115668 diff --git a/gnote-0.8.2.tar.xz b/gnote-0.8.2.tar.xz new file mode 100644 index 0000000..c5c2489 --- /dev/null +++ b/gnote-0.8.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992 +size 2322160 diff --git a/gnote-buildfix.patch b/gnote-buildfix.patch deleted file mode 100644 index 96dc43c..0000000 --- a/gnote-buildfix.patch +++ /dev/null @@ -1,88 +0,0 @@ -From eef5253c18eb126b3cfbbae7c417b5297ecf883e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Thu, 1 Dec 2011 22:35:19 +0100 -Subject: [PATCH 1/2] Bug: 655340: src/notetag.hpp must include - ---- - src/notetag.hpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/notetag.hpp b/src/notetag.hpp -index aa33abe..e3137b9 100644 ---- a/src/notetag.hpp -+++ b/src/notetag.hpp -@@ -24,6 +24,7 @@ - #define __NOTE_TAG_HPP_ - - #include -+#include - - #include - #include --- -1.7.7 - -From 4b15d36f7a3478f54d3f41f2146f111241e5e3a1 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Thu, 1 Dec 2011 22:55:55 +0100 -Subject: [PATCH 2/2] Bug 655344: #include as appropriate - ---- - src/addins/exporttohtml/exporttohtmldialog.cpp | 1 + - src/addins/printnotes/printnotesnoteaddin.cpp | 1 + - src/notebuffer.cpp | 1 + - src/utils.cpp | 2 +- - 4 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/src/addins/exporttohtml/exporttohtmldialog.cpp b/src/addins/exporttohtml/exporttohtmldialog.cpp -index 15823f8..7b7c3a6 100644 ---- a/src/addins/exporttohtml/exporttohtmldialog.cpp -+++ b/src/addins/exporttohtml/exporttohtmldialog.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include // for get_home_dir() - - #include "sharp/files.hpp" - #include "exporttohtmldialog.hpp" -diff --git a/src/addins/printnotes/printnotesnoteaddin.cpp b/src/addins/printnotes/printnotesnoteaddin.cpp -index 7bede83..cd8f83e 100644 ---- a/src/addins/printnotes/printnotesnoteaddin.cpp -+++ b/src/addins/printnotes/printnotesnoteaddin.cpp -@@ -22,6 +22,7 @@ - - #include - -+#include // for get_home_dir() - #include - #include - #include -diff --git a/src/notebuffer.cpp b/src/notebuffer.cpp -index 48bca2d..275045f 100644 ---- a/src/notebuffer.cpp -+++ b/src/notebuffer.cpp -@@ -33,6 +33,7 @@ - - #include "sharp/xmlreader.hpp" - #include "sharp/xmlwriter.hpp" -+#include - - namespace gnote { - -diff --git a/src/utils.cpp b/src/utils.cpp -index 693412f..6e839ee 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -33,7 +33,7 @@ - #include - - #include --#include -+#include - #include - #include - #include --- -1.7.7 - diff --git a/gnote.changes b/gnote.changes index 0a9ee7b..2397e29 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Jan 3 07:50:31 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.8.2: + + New Features: + - Added template bar to template notes + - Integrated with GtkApplication (bgo#640430) + - Gnote remains present while at least one window is present + - Panel applet disabled by default + - Added option for status icon to preferences (bgo#663817) + - Added background mode + - Return ordered note list when using D-BUS search (bgo#662246) + + Fixes: + - Fixed keys in GSettings schema descriptions + - Manual fixes + - Updated man page to current behaviour + - Do not open Search Window in status icon mode (bgo#653447) + - Fixed special XML character encoding + - Make sticky note importer support special chars + - Show in all desktop environements (bgo#664609) + - src/notetag.hpp must include (bgo#655340) + - Add missing includes (bgo#665344) + - Fixed a warning about a condition never reached + - Fixed note deletion with international characters + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Drop gnote-buildfix.patch: fixed upstream. +- Pass --enable-applet to configure to keep building the applet. + ------------------------------------------------------------------- Thu Dec 1 21:57:00 UTC 2011 - dimstar@opensuse.org diff --git a/gnote.spec b/gnote.spec index 37458f1..bd12866 100644 --- a/gnote.spec +++ b/gnote.spec @@ -1,7 +1,7 @@ # # spec file for package gnote # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,14 @@ # - Name: gnote -Version: 0.8.1 -Release: 1 -License: GNU GPL v3 or later +Version: 0.8.2 +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.bz2 -# PATCH-FIX-UPSTREAM bgo#655340 bgo#655344 dimstar@opensuse.org -- Fix build on current Factory. -Patch0: gnote-buildfix.patch +Source: http://download.gnome.org/sources/gnote/0.8/%{name}-%{version}.tar.xz BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -38,6 +35,8 @@ 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 @@ -50,10 +49,9 @@ to come). Synchronization support is being worked on. %lang_package %prep %setup -q -%patch0 -p1 %build -%configure --disable-static --disable-scrollkeeper +%configure --disable-static --disable-scrollkeeper --enable-applet V=1 make %{?_smp_mflags} %install