From e4cb50b11940b49ce0f2734cd80b87b42cf2637c Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Mar 31 2011 19:01:20 +0000 Subject: Update to 0.2.8. Bump minimum version of tp-glib needed. Drop infinite loop patch. Fixed upstream. --- diff --git a/.gitignore b/.gitignore index da462cf..4d5d3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ telepathy-logger-0.1.5.tar.bz2 /telepathy-logger-0.2.5.tar.bz2 /telepathy-logger-0.2.6.tar.bz2 /telepathy-logger-0.2.7.tar.bz2 +/telepathy-logger-0.2.8.tar.bz2 diff --git a/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch b/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch deleted file mode 100644 index fbb4260..0000000 --- a/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 884c52dad5d5fb30a450b013b83aed306ed49164 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne -Date: Wed, 30 Mar 2011 12:08:35 -0400 -Subject: [PATCH] Fix infinit loop in pending message cache logic - ---- - telepathy-logger/text-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c -index 919c8f6..c721358 100644 ---- a/telepathy-logger/text-channel.c -+++ b/telepathy-logger/text-channel.c -@@ -632,7 +632,7 @@ pendingproc_store_pending_messages (TplActionChain *ctx, - to_remove = g_list_prepend (to_remove, GUINT_TO_POINTER (cached->id)); - cached_it = g_list_next (cached_it); - } -- else if (cached->id < pending_id) -+ else - { - /* The pending message has not been logged */ - to_log = g_list_prepend (to_log, pending); --- -1.7.4.1 - diff --git a/sources b/sources index 4953f60..5e581ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e324532efca0b0437bb35e5ffda8e4f telepathy-logger-0.2.7.tar.bz2 +755e6dcaa6a9ccf47f2fe73f3d4d888b telepathy-logger-0.2.8.tar.bz2 diff --git a/telepathy-logger.spec b/telepathy-logger.spec index 9592a71..1adfc28 100644 --- a/telepathy-logger.spec +++ b/telepathy-logger.spec @@ -1,17 +1,16 @@ Name: telepathy-logger -Version: 0.2.7 -Release: 2%{?dist} +Version: 0.2.8 +Release: 1%{?dist} Summary: Telepathy framework logging daemon Group: Applications/Communications License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/Logger Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: 0001-Fix-infinit-loop-in-pending-message-cache-logic.patch BuildRequires: dbus-devel >= 1.1.0 BuildRequires: dbus-glib-devel >= 0.82 -BuildRequires: telepathy-glib-devel >= 0.11.7 +BuildRequires: telepathy-glib-devel >= 0.14.0 BuildRequires: glib2-devel >= 2.25.11 BuildRequires: sqlite-devel BuildRequires: libxml2-devel @@ -44,7 +43,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .infinite #%check @@ -98,7 +96,12 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %changelog -* Mon Mar 30 2011 Brian Pepple - 0.2.7-2 +* Thu Mar 31 2011 Brian Pepple - 0.2.8-1 +- Update to 0.2.8. +- Bump minimum version of tp-glib needed. +- Drop infinite loop patch. Fixed upstream. + +* Wed Mar 30 2011 Brian Pepple - 0.2.7-2 - Backport patch from upstream git for a change that wasn't included with original tarball. Refer to http://lists.freedesktop.org/archives/telepathy/2011-March/005381.html