diff --git a/.cvsignore b/.cvsignore index dbdd32a..0f80fdb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnote-0.7.1.tar.bz2 +gnote-0.7.2.tar.bz2 diff --git a/gnote-libx11-dso.patch b/gnote-libx11-dso.patch deleted file mode 100644 index 1bdc78c..0000000 --- a/gnote-libx11-dso.patch +++ /dev/null @@ -1,24 +0,0 @@ -Only in ./: gnote-libX11-FTBFS.patch -diff -ur ../gnote-0.7.1.orig/src/Makefile.am ./src/Makefile.am ---- ../gnote-0.7.1.orig/src/Makefile.am 2009-12-28 17:16:01.000000000 +0530 -+++ ./src/Makefile.am 2010-02-15 22:52:58.350112785 +0530 -@@ -158,5 +158,6 @@ - $(APPLET_SOURCES) \ - $(NULL) - --gnote_LDADD = $(GNOTE_LIBS) -+gnote_LDADD = $(GNOTE_LIBS) \ -+ -lX11 - -diff -ur ../gnote-0.7.1.orig/src/Makefile.in ./src/Makefile.in ---- ../gnote-0.7.1.orig/src/Makefile.in 2010-01-04 19:46:51.000000000 +0530 -+++ ./src/Makefile.in 2010-02-15 22:56:25.741111651 +0530 -@@ -584,7 +584,7 @@ - $(APPLET_SOURCES) \ - $(NULL) - --gnote_LDADD = $(GNOTE_LIBS) -+gnote_LDADD = $(GNOTE_LIBS) -lX11 - all: all-recursive - - .SUFFIXES: diff --git a/gnote-replace-dep-macros.patch b/gnote-replace-dep-macros.patch new file mode 100644 index 0000000..13b3ee1 --- /dev/null +++ b/gnote-replace-dep-macros.patch @@ -0,0 +1,40 @@ +From b2e62adb1ed94f9a3f681bd6d0b8117b2ec3c1f9 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Sun, 14 Mar 2010 21:24:21 +0000 +Subject: Replaced deprecated macros -- GTK_WIDGET_REALIZED & GTK_WIDGET_VISIBLE + +These macros have been deprecated since Gtk+ 2.20, and their +replacements were introduced in Gtk+ 2.18. Thus, the minimum Gtk+ +version has been bumped accordingly. +--- +diff --git a/configure.ac b/configure.ac +index 564c0b0..0189b88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ AC_SUBST(GNOTE_VERSION) + dnl all the library version. + dnl if one is harcoded elsewhere, it is a bug + +-GTK_VERSION=2.12 ++GTK_VERSION=2.18 + LIBGLIBMM_VERSION=2.0 + LIBGTKMM_VERSION=2.12.0 + LIBGCONF_VERSION=2.0.0 +diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c +index 162e4a2..9de7e62 100644 +--- a/libtomboy/tomboyutil.c ++++ b/libtomboy/tomboyutil.c +@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWindow *window) + void + tomboy_window_present_hardcore (GtkWindow *window) + { +- if (!GTK_WIDGET_REALIZED (window)) ++ if (!gtk_widget_get_realized (GTK_WIDGET (window))) + gtk_widget_realize (GTK_WIDGET (window)); +- else if (GTK_WIDGET_VISIBLE (window)) ++ else if (gtk_widget_get_visible (GTK_WIDGET (window))) + tomboy_window_move_to_current_workspace (window); + + tomboy_window_override_user_time (window); +-- +cgit v0.8.3.1 diff --git a/gnote.spec b/gnote.spec index 19e0563..25ba778 100644 --- a/gnote.spec +++ b/gnote.spec @@ -1,12 +1,16 @@ Name: gnote -Version: 0.7.1 -Release: 3%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Note-taking application Group: User Interface/Desktops License: GPLv3+ URL: http://live.gnome.org/Gnote Source0: http://ftp.gnome.org/pub/GNOME/sources/gnote/0.7/%{name}-%{version}.tar.bz2 +# patch from upstream http://git.gnome.org/browse/gnote/commit/?id=b2e62adb1ed94f9a3f681bd6d0b8117b2ec3c1f9 +# required to build in Fedora 13+ +Patch0: gnote-replace-dep-macros.patch + BuildRequires: gtkmm24-devel libxml2-devel GConf2-devel intltool BuildRequires: boost-devel libuuid-devel dbus-c++-devel BuildRequires: desktop-file-utils @@ -15,7 +19,6 @@ BuildRequires: libpanelappletmm-devel BuildRequires: gettext pcre-devel BuildRequires: gtkspell-devel -Patch1: gnote-libx11-dso.patch Requires(pre) :GConf2 Requires(post) :GConf2 Requires(preun):GConf2 @@ -28,7 +31,7 @@ and consumes fewer resources. %prep %setup -q -%patch1 -p1 +%patch0 -p1 %build %configure --disable-schemas-install --disable-static --with-gnu-ld --enable-dbus @@ -99,6 +102,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/dbus-1/services/org.gnome.Gnote.service %changelog +* Fri Mar 12 2010 Rahul Sundaram - 0.7.2-1 +- Ability to search for phrases, prompt while renaming notes, bug fixes +- Add a patch from upstream master to replace deprecated macros +- Drop upstreamed patch to fix dso linking +- http://mail.gnome.org/archives/gnote-list/2010-March/msg00010.html + * Tue Feb 16 2010 Rahul Sundaram - 0.7.1-3 - Fix implicit DSO linking (thanks to Ankur Sinha) - Fixes bz#564774 diff --git a/sources b/sources index bc4d568..e02101c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -894ccd75570e576166ff50893abe75ab gnote-0.7.1.tar.bz2 +c4e1a93896cb8610d2e08c72d41f1777 gnote-0.7.2.tar.bz2