Hello community, here is the log from the commit of package liferea for openSUSE:Factory checked in at Tue Jul 5 10:29:35 CEST 2011. -------- --- GNOME/liferea/liferea.changes 2011-04-11 14:25:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/liferea/liferea.changes 2011-07-01 14:01:34.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Jun 22 12:33:07 CEST 2011 - dimstar@opensuse.org + +- Update to version 1.6.6: + + Removed the obsolete Bloglines support. + + Removed bookmarking support for the dead Backflip. + + Fixes second search not clearing item list. + + Fixes accidental drag&drop in HTML view. + + sf#3019444 and sf#2978831: incorrect handling of HTTP 301 + + sf#3103875: Opening URLs with UTF-8 characters + + deb#600638: Wrong number of unread items in mouse over tray + icon with zh_TW locale. + + liferea.glade: Mark 2 messages as translatable that were + wrongly not marked. + + Fix build with stricter linkers. + + Updated translations. +- Drop patches: + + libnotify-0.7-api.patch: the 1.6.x tree got changed to not + support libnotify > 0.5. Additionally, it's overcomplex. In + order to support libnotify 0.7, we have a new patch. + + liferea-1.6.5-nm09.patch: fixed upstream. +- Add liferea-libnotify07.patch: upstream wanted to limit usage of + libnotify to maximum 0.5.x in liferea 1.6.x tree, which is + something we don't want to do. +- Add liferea_dbus.xml as SOURCE1: the file is missing in the + tarball. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnotify-0.7-api.patch liferea-1.6.5-nm09.patch liferea-1.6.5.tar.bz2 New: ---- liferea-1.6.6.tar.gz liferea-libnotify07.patch liferea_dbus.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.CVmtBy/_old 2011-07-05 10:28:34.000000000 +0200 +++ /var/tmp/diff_new_pack.CVmtBy/_new 2011-07-05 10:28:34.000000000 +0200 @@ -21,18 +21,18 @@ Name: liferea License: GPLv2+ Group: Productivity/Other -Version: 1.6.5 -Release: 9 +Version: 1.6.6 +Release: 1 +# FIXME: Make sure to remove liferea_dbus.xml again with next tarball. Summary: Linux Feed Reader Url: http://liferea.sourceforge.net/ -Source: %{name}-%{version}.tar.bz2 +Source: http://sourceforge.net/projects/liferea/files/Liferea%20Stable/%{version}/%{name}-%{version}.tar.gz +# liferea_dbus.xml missing in the 1.6.6 tarballs; taken from git. +Source1: liferea_dbus.xml # PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds Patch0: liferea-opensuse-feeds.patch -# PATCH-FIX-UPSTREAM libnotify-0.7-api.patch fcrozat@novell.com -- fix build with libnotify 0.7.x (git) -Patch1: libnotify-0.7-api.patch -# PATCH-FIX-UPSTREAM liferea-1.6.5-nm09.patch fcrozat@novell.com -- fix compatibility with NM 0.9 (git) -Patch2: liferea-1.6.5-nm09.patch - +# PATCH-FIX-UPSTREAM liferea-libnotify07.patch dimstar@opensuse.org -- fix build with libnotify 0.7.x; discussed with upstream, but won't enter 1.6.x branch +Patch1: liferea-libnotify07.patch BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel BuildRequires: fdupes @@ -64,9 +64,13 @@ %lang_package %prep %setup -q +if [ -f src/liferea_dbus.xml]; then + echo "src/liferea_dbus.xml is part of the tarball. Please drop it from the source section." + /bin/false +fi +cp %{S:1} src/liferea_dbus.xml %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi ++++++ liferea-libnotify07.patch ++++++ Index: liferea-1.6.6/configure.ac =================================================================== --- liferea-1.6.6.orig/configure.ac +++ liferea-1.6.6/configure.ac @@ -77,7 +77,7 @@ dnl libnotify dnl ********* if test "x$enable_libnotify" = "xyes"; then - PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify << 0.5],enable_libnotify=yes,enable_libnotify=no) + PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2],enable_libnotify=yes,enable_libnotify=no) AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) else Index: liferea-1.6.6/src/notification/libnotify.c =================================================================== --- liferea-1.6.6.orig/src/notification/libnotify.c +++ liferea-1.6.6/src/notification/libnotify.c @@ -43,6 +43,10 @@ #include "notification/notification.h" +#ifndef NOTIFY_CHECK_VERSION +#define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif + static gboolean supports_actions = FALSE; static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) { @@ -150,8 +154,12 @@ static void notif_libnotify_callback_sho // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); // notify_notification_clear_actions(n); - n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); - + n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL +#if NOTIFY_CHECK_VERSION (0, 7, 0) + ); +#else + ,NULL); +#endif notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); notify_notification_set_category (n, "feed"); @@ -244,7 +252,12 @@ notif_libnotify_node_has_new_items (node labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), node_get_title (node), item_count); - n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); + n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL +#if NOTIFY_CHECK_VERSION (0, 7, 0) + ); +#else + ,NULL); +#endif g_free(labelSummary_p); notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); ++++++ liferea_dbus.xml ++++++ <node name="/org/gnome/feed/Reader"> <interface name="org.gnome.feed.Reader"> <method name="Ping"> <arg name="result" type="b" direction="out"/> </method> <method name="SetOnline"> <arg name="online" type="b"/> <arg name="result" type="b" direction="out"/> </method> <method name="Subscribe"> <arg name="url" type="s"/> <arg name="result" type="b" direction="out"/> </method> <method name="GetUnreadItems"> <arg name="result" type="i" direction="out"/> </method> <method name="GetNewItems"> <arg name="result" type="i" direction="out"/> </method> </interface> </node> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org