Attachment 943178 Details for Bug 971112 – Update rpm to v0.8.1 and add the patch v2

[patch] Update rpm to v0.8.1 and add the patch v2

0001-Update-to-0.8.1.patch (text/plain), 3.94 KB, created by Soeren Grunewald on 2014-10-01 18:22:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Soeren Grunewald

Created: 2014-10-01 18:22:26 UTC

Size: 3.94 KB

patch

obsolete

>From 13ca56c7fcab5598c90d64e8740532c1cba1d9b2 Mon Sep 17 00:00:00 2001
>From: Soeren Grunewald <soeren.grunewald@gmx.net>
>Date: Wed, 1 Oct 2014 20:05:58 +0200
>Subject: [PATCH] Update to 0.8.1
>
>This updates the package to v0.8.1 and also adds a patch to solve BZ#971112
>which is open since F19.
>I used the patch proposed for the upstream bug-report [1] and not the one from
>the fedora bug-report.
>
>Signed-off-by: Soeren Grunewald <soeren.grunewald@gmx.net>
>
>[1] https://bugs.freedesktop.org/show_bug.cgi?id=63458
>---
> sources                                            |  2 +-
> ...y-logger-0.8.1-log-iter-skip-to-next-date.patch | 41 ++++++++++++++++++++++
> telepathy-logger.spec                              | 10 ++++--
> 3 files changed, 50 insertions(+), 3 deletions(-)
> create mode 100644 telepathy-logger-0.8.1-log-iter-skip-to-next-date.patch
>
>diff --git a/sources b/sources
>index 30fc2fe..203e2f2 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-e513eaa767344821073a0b7bb8b45217  telepathy-logger-0.8.0.tar.bz2
>+88f7dfde882d987b9c93b645efab2f43  telepathy-logger-0.8.1.tar.bz2
>diff --git a/telepathy-logger-0.8.1-log-iter-skip-to-next-date.patch b/telepathy-logger-0.8.1-log-iter-skip-to-next-date.patch
>new file mode 100644
>index 0000000..4756cdd
>--- /dev/null
>+++ b/telepathy-logger-0.8.1-log-iter-skip-to-next-date.patch
>@@ -0,0 +1,41 @@
>+From 4d8bd8f0424ce336b4c137baa14359c12e89e0c2 Mon Sep 17 00:00:00 2001
>+From: Alban Browaeys <prahal@yahoo.com>
>+Date: Thu, 11 Apr 2013 09:55:59 +0200
>+Subject: [PATCH] log-iter: skip to next date if the selected one has no
>+ events.
>+---
>+ telepathy-logger/log-iter-pidgin.c | 2 ++
>+ telepathy-logger/log-iter-xml.c    | 2 ++
>+ 2 files changed, 4 insertions(+)
>+
>+diff --git a/telepathy-logger/log-iter-pidgin.c b/telepathy-logger/log-iter-pidgin.c
>+index a9263d4..7c46624 100644
>+--- a/telepathy-logger/log-iter-pidgin.c
>++++ b/telepathy-logger/log-iter-pidgin.c
>+@@ -82,6 +82,8 @@ tpl_log_iter_pidgin_get_events (TplLogIter *iter,
>+ 
>+           priv->next_event = g_list_last (priv->events);
>+           priv->next_date = g_list_previous (priv->next_date);
>++
>++          if (priv->next_event == NULL) continue;
>+         }
>+ 
>+       event = TPL_EVENT (priv->next_event->data);
>+diff --git a/telepathy-logger/log-iter-xml.c b/telepathy-logger/log-iter-xml.c
>+index 1684a74..c9ae0c2 100644
>+--- a/telepathy-logger/log-iter-xml.c
>++++ b/telepathy-logger/log-iter-xml.c
>+@@ -83,6 +83,8 @@ tpl_log_iter_xml_get_events (TplLogIter *iter,
>+ 
>+           priv->next_event = g_list_last (priv->events);
>+           priv->next_date = g_list_previous (priv->next_date);
>++
>++          if (priv->next_event == NULL) continue;
>+         }
>+ 
>+       event = TPL_EVENT (priv->next_event->data);
>+-- 
>+2.1.0
>+
>diff --git a/telepathy-logger.spec b/telepathy-logger.spec
>index fc2787b..7ccce7b 100644
>--- a/telepathy-logger.spec
>+++ b/telepathy-logger.spec
>@@ -1,12 +1,13 @@
> Name:           telepathy-logger
>-Version:        0.8.0
>-Release:        7%{?dist}
>+Version:        0.8.1
>+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
>+Patch1:         %{name}-%{version}-log-iter-skip-to-next-date.patch
> 
> BuildRequires:  dbus-devel >= 1.1.0
> BuildRequires:  dbus-glib-devel >= 0.82
>@@ -41,6 +42,7 @@ developing applications that use %{name}.
> 
> %prep
> %setup -q
>+%patch1 -p1
> 
> # more rpath hacks
> %if "%{_libdir}" != "/usr/lib"
>@@ -99,6 +101,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &>/dev/null |
> 
> 
> %changelog
>+* Wed Oct 01 2014 Soeren Grunewald <soeren.grunewald@gmx.net> - 0.8.1-1
>+- Update to 0.8.1
>+- Add patch to fix BZ#971112
>+
> * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
> 
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 971112: 757322 | 757323 | 757324 | 757325 | 757326 | 757327 | 757328 | 757329 | 757330 | 757331 | 783304 | 784240 | 943177 | 943178