diff --git a/gnote-0.7.5.tar.bz2 b/gnote-0.7.5.tar.bz2 deleted file mode 100644 index 83c05c6..0000000 --- a/gnote-0.7.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0aa2b131023b147c90dcbae7ed4339f823002337afd3fa0f6babf5e4a1b20d7e -size 2292037 diff --git a/gnote-0.8.0.tar.bz2 b/gnote-0.8.0.tar.bz2 new file mode 100644 index 0000000..60461b6 --- /dev/null +++ b/gnote-0.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0e55f1358ae1f36555d28b54f23f6a8711a4acfc6c4ecd171da537b9e222d36 +size 1748023 diff --git a/gnote-no-deprecated.patch b/gnote-no-deprecated.patch deleted file mode 100644 index 428d125..0000000 --- a/gnote-no-deprecated.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 49cefcc356732b25f34e8b1badabbab079c8377b -Author: Vincent Untz -Date: Tue May 31 15:45:26 2011 +0200 - - Stop using some deprecated GdkDrawable API - - https://bugzilla.gnome.org/show_bug.cgi?id=651551 - -diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c -index 77e71f9..661cb9f 100644 ---- a/libtomboy/tomboyutil.c -+++ b/libtomboy/tomboyutil.c -@@ -73,7 +73,7 @@ tomboy_window_move_to_current_workspace (GtkWindow *window) - { - GdkWindow *gdkwin = gtk_widget_get_window(GTK_WIDGET (window)); - GdkWindow *rootwin = -- gdk_screen_get_root_window (gdk_drawable_get_screen (gdkwin)); -+ gdk_screen_get_root_window (gdk_window_get_screen (gdkwin)); - - GdkAtom current_desktop = - gdk_atom_intern ("_NET_CURRENT_DESKTOP", FALSE); -@@ -107,7 +107,7 @@ tomboy_window_move_to_current_workspace (GtkWindow *window) - xev.xclient.window = GDK_WINDOW_XID (gdkwin); - xev.xclient.message_type = - gdk_x11_atom_to_xatom_for_display( -- gdk_drawable_get_display (gdkwin), -+ gdk_window_get_display (gdkwin), - wm_desktop); - xev.xclient.format = 32; - xev.xclient.data.l[0] = workspace; diff --git a/gnote.changes b/gnote.changes index f8cc3ff..b2323e2 100644 --- a/gnote.changes +++ b/gnote.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Sun Sep 25 23:10:13 UTC 2011 - vuntz@opensuse.org + +- Update to version 0.8.0: + + New features: + - Ported to GTK 3.0 + - New documentation in Mallard format + - Handle x-scheme-handler/note mime-type + - Use pkg-config for uuid (bgo#649486) + - Build only shared libraries for addins (bgo#620015) + - Search window context menus rework (bgo#601852) + - Disabled GtkSpell + - Ported panel applet to libpanelapplet-4 (bgo#639779) + - Ported configuration to Gio::Settings + - Status icon presence is now configurable + - About dialog is now a child of Search All Notes + - Added replace title addin (bgo#639938) + - Changed search to prioritize note titles + - Ported D-Bus support to Gio::DBus (also fixes bgo#618330) + - Open all selected notes + - Show note title when deleting only 1 note + - Removed minimum size on Search All Notes Window + - Set min width of note title column to 150 + + Fixes: + - Place user local addins in addins subdirectory (bgo#619867) + - Change tomboyimport according recent Tomboy + - Import sticky notes when Tomboy is not installed (bgo#605382) + - Use actual visibility of status icon (bgo#650001) + - Fix dragging notes to Unfiled notes (bgo#655208) + - Fix command line option --new-note with argument + - Fix delete key behaviour in bulleted list + - Don't create nested links + + Updated translations. +- Drop gnote-no-deprecated.patch: fixed upstream. +- Remove gconf2-devel BuildRequires: ported to GSettings. +- Chnage gtkmm2-devel BuildRequires to gtkmm3-devel, following port + to GTK+ 3. +- Remove gtkspell-devel BuildRequires: there's no gtkspell support + for GTK+ 3 right now. +- Change libpanelappletmm-devel BuildRequires to + pkgconfig(libpanelapplet-4.0), following port to new library. + Also remove the build_applet define, since it's now unneeded. +- Stop passing --enable-dbus to configure: this option is now gone. +- Replace gconf schema packaging machinery with gsettings + machinery. + ------------------------------------------------------------------- Sun Jul 31 09:15:01 CEST 2011 - vuntz@opensuse.org diff --git a/gnote.spec b/gnote.spec index 79c3c7e..e0d928a 100644 --- a/gnote.spec +++ b/gnote.spec @@ -16,38 +16,30 @@ # -%define build_applet %{?favor_gtk2} Name: gnote -Version: 0.7.5 +Version: 0.8.0 Release: 1 -# FIXME: on version upgrade, check if build_applet is still needed (last checked: 0.7.4) License: GNU GPL v3 or later Summary: A Port of Tomboy to C++ Group: Productivity/Text/Editors Url: http://live.gnome.org/Gnote -Source: http://download.gnome.org/sources/gnote/0.7/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnote-no-deprecated.patch bgo#651551 vuntz@opensuse.org -- Do not use deprecated API -Patch0: gnote-no-deprecated.patch +Source: http://download.gnome.org/sources/gnote/0.8/%{name}-%{version}.tar.bz2 BuildRequires: boost-devel >= 1.34 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel -BuildRequires: gtkmm2-devel >= 2.20 -BuildRequires: gtkspell-devel +BuildRequires: gtkmm3-devel >= 3.0 BuildRequires: intltool -%if 0%{?build_applet} -BuildRequires: libpanelappletmm-devel -%endif BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: pcre-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(libpanelapplet-4.0) >= 3.0 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description It is the same note taking application, including most of the add-ins (more are @@ -56,30 +48,23 @@ to come). Synchronization support is being worked on. %lang_package %prep %setup -q -%patch0 -p1 %build -%configure --disable-static --disable-schemas-install --disable-scrollkeeper --enable-dbus -V=1 %__make %{?_smp_mflags} +%configure --disable-static --disable-scrollkeeper +V=1 make %{?_smp_mflags} %install -%__make install DESTDIR=%{buildroot} +%make_install %suse_update_desktop_file gnote Utility DesktopUtility -%find_gconf_schemas %find_lang %{name} %{?no_lang_C} %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - -%preun -f %{name}.schemas_preun - -%posttrans -f %{name}.schemas_posttrans - %if 0%{?suse_version} > 1130 %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %endif @@ -87,26 +72,25 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %if 0%{?suse_version} > 1130 %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %endif -%files -f %{name}.schemas_list +%files %defattr(-,root,root) %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/%{name}/ %doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/gnote -%if 0%{?build_applet} -%{_prefix}/lib/gnote-applet -%{_libdir}/bonobo/servers/GNOME_GnoteApplet.server -%endif +%{_libexecdir}/gnote-applet %{_libdir}/gnote/ %{_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*