From c0570a5b93f9cd397189556976197235905614589132686026c1d943215761a1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 17 Jul 2012 15:40:46 +0000 Subject: [PATCH] Accepting request 128138 from home:Zaitor:branches:GNOME:Apps Update. Wanted for 12.2 as it fixes bnc#771705 - gnote shows empty gray windows Gnote does not start at all for anyone atm in 12.2 so getting this before goldmaster would be nice. Gnote is a leaf package so it should be perfectly safe. OBS-URL: https://build.opensuse.org/request/show/128138 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=24 --- gnote-0.9.0.tar.xz | 3 --- gnote-0.9.1.tar.xz | 3 +++ gnote-buildfix.patch | 25 ------------------------- gnote.changes | 27 +++++++++++++++++++++++++++ gnote.spec | 14 ++++---------- 5 files changed, 34 insertions(+), 38 deletions(-) delete mode 100644 gnote-0.9.0.tar.xz create mode 100644 gnote-0.9.1.tar.xz delete mode 100644 gnote-buildfix.patch diff --git a/gnote-0.9.0.tar.xz b/gnote-0.9.0.tar.xz deleted file mode 100644 index 80c4709..0000000 --- a/gnote-0.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd875b74c4fd19bdeaebf8bfb55b71a6467eb03d55c67ff9a680bef5943166b3 -size 2373456 diff --git a/gnote-0.9.1.tar.xz b/gnote-0.9.1.tar.xz new file mode 100644 index 0000000..e935dec --- /dev/null +++ b/gnote-0.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81131e86b9d47892d97b3f8e41d6508a34a9752d7d0e7a98717878ae45d864bc +size 2419496 diff --git a/gnote-buildfix.patch b/gnote-buildfix.patch deleted file mode 100644 index fb76fe5..0000000 --- a/gnote-buildfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d0e06bcc294330ccd83c60d54b56bc5741160ce5 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -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 - #include - -+#include - #include - - #include "note.hpp" --- -1.7.9.2 - diff --git a/gnote.changes b/gnote.changes index df66816..d10b155 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Jul 16 16:36:25 UTC 2012 - zaitor@opensuse.org + +- Update to version 0.9.1: + + New Features: + - Gtkmm 3.4 is required + - Derived Search window from Gtk::ApplicationWindow + - Replace shave with automake's silent rules (#673710) + - Added 256x256 app icon (#674267) + - Added log to file capability in debug mode + - Added gnome-keyring dependency + - Added WebDAV synchronization + - Droped support for panel applet + - Migrated to Gtk::Application + + Fixes: + - Fix quit application for glib >= 2.32 (#670104) + - Removed use of deprecated GtkStyle (#667395) + - Fixed missing include for Glibmm 2.32 (#671787) + - Fixed multiple compiler warnings + - Fix bullet indentation when printing (#674904) + + Updated translations. +- Drop gnote-buildfix.patch, fixed upstream. +- Drop BuildRequires: pkgconfig(libpanelapplet-4.0), not needed + anymore. +- Add BuildRequires: pkgconfig(gnome-keyring-1), pulled in by + something else before. + ------------------------------------------------------------------- Sat Mar 10 18:28:58 UTC 2012 - dimstar@opensuse.org diff --git a/gnote.spec b/gnote.spec index e8bf46f..bbd72f3 100644 --- a/gnote.spec +++ b/gnote.spec @@ -17,27 +17,25 @@ Name: gnote -Version: 0.9.0 +Version: 0.9.1 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.9/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnote-buildfix.patch bgo#671787 dimstar@opensuse.org -- Fix build by including missing headers. -Patch0: gnote-buildfix.patch BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel -BuildRequires: gtkmm3-devel >= 3.0 +BuildRequires: gtkmm3-devel >= 3.4 BuildRequires: intltool BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libpanelapplet-4.0) >= 3.0 +BuildRequires: pkgconfig(gnome-keyring-1) >= 3.0 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -49,10 +47,9 @@ to come). Synchronization support is being worked on. %lang_package %prep %setup -q -%patch0 -p1 %build -%configure --disable-static --disable-scrollkeeper --enable-applet +%configure --disable-static --disable-scrollkeeper V=1 make %{?_smp_mflags} %install @@ -87,16 +84,13 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %dir %{_datadir}/gnome/help/%{name}/ %doc %{_datadir}/gnome/help/%{name}/C/ %{_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 %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml -%{_datadir}/gnome-panel/4.0/applets/org.gnome.gnote.panel-applet %{_datadir}/gnote/ %{_datadir}/icons/hicolor/*/apps/gnote.* %{_mandir}/man1/gnote.1*