From 333f752678213c328f61851c6e60fba48cca39ad74829400f0520df38b1c5f6a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Apr 2009 23:46:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=37 --- pidgin-gnome-keyring.patch | 31 ++++++++++++++++--------------- pidgin.changes | 6 ++++++ pidgin.spec | 9 ++++++--- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/pidgin-gnome-keyring.patch b/pidgin-gnome-keyring.patch index a949b16..1d23b20 100644 --- a/pidgin-gnome-keyring.patch +++ b/pidgin-gnome-keyring.patch @@ -1,8 +1,8 @@ -Index: pidgin-2.4.2/configure.ac +Index: pidgin-2.5.5/configure.ac =================================================================== ---- pidgin-2.4.2.orig/configure.ac -+++ pidgin-2.4.2/configure.ac -@@ -1678,6 +1678,20 @@ if test "x$enable_nss" != "xno"; then +--- pidgin-2.5.5.orig/configure.ac ++++ pidgin-2.5.5/configure.ac +@@ -1744,6 +1744,20 @@ if test "x$enable_nss" != "xno"; then [AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])], [with_nss_libs="$withval"]) @@ -23,11 +23,11 @@ Index: pidgin-2.4.2/configure.ac if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \ test -n "$with_nss_includes" || test -n "$with_nss_libs" || -Index: pidgin-2.4.2/libpurple/Makefile.am +Index: pidgin-2.5.5/libpurple/Makefile.am =================================================================== ---- pidgin-2.4.2.orig/libpurple/Makefile.am -+++ pidgin-2.4.2/libpurple/Makefile.am -@@ -245,6 +245,7 @@ libpurple_la_LIBADD = \ +--- pidgin-2.5.5.orig/libpurple/Makefile.am ++++ pidgin-2.5.5/libpurple/Makefile.am +@@ -247,6 +247,7 @@ libpurple_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBXML_LIBS) \ $(NETWORKMANAGER_LIBS) \ @@ -35,17 +35,18 @@ Index: pidgin-2.4.2/libpurple/Makefile.am $(INTLLIBS) \ -lm -@@ -257,5 +258,6 @@ AM_CPPFLAGS = \ +@@ -259,6 +260,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ $(DBUS_CFLAGS) \ + $(PURPLE_KEYRING_CFLAGS) \ $(LIBXML_CFLAGS) \ $(NETWORKMANAGER_CFLAGS) -Index: pidgin-2.4.2/libpurple/account.c + +Index: pidgin-2.5.5/libpurple/account.c =================================================================== ---- pidgin-2.4.2.orig/libpurple/account.c -+++ pidgin-2.4.2/libpurple/account.c +--- pidgin-2.5.5.orig/libpurple/account.c ++++ pidgin-2.5.5/libpurple/account.c @@ -49,6 +49,13 @@ typedef struct #define PURPLE_ACCOUNT_GET_PRIVATE(account) \ ((PurpleAccountPrivate *) (account->priv)) @@ -60,7 +61,7 @@ Index: pidgin-2.4.2/libpurple/account.c /* TODO: Should use PurpleValue instead of this? What about "ui"? */ typedef struct { -@@ -374,8 +381,13 @@ account_to_xmlnode(PurpleAccount *accoun +@@ -380,8 +387,13 @@ account_to_xmlnode(PurpleAccount *accoun if (purple_account_get_remember_password(account) && ((tmp = purple_account_get_password(account)) != NULL)) { @@ -74,7 +75,7 @@ Index: pidgin-2.4.2/libpurple/account.c } if ((tmp = purple_account_get_alias(account)) != NULL) -@@ -790,17 +802,30 @@ parse_account(xmlnode *node) +@@ -796,17 +808,30 @@ parse_account(xmlnode *node) } ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */ @@ -111,7 +112,7 @@ Index: pidgin-2.4.2/libpurple/account.c /* Read the alias */ child = xmlnode_get_child(node, "alias"); -@@ -2778,3 +2803,60 @@ purple_accounts_uninit(void) +@@ -2797,3 +2822,60 @@ purple_accounts_uninit(void) purple_signals_disconnect_by_handle(handle); purple_signals_unregister_by_instance(handle); } diff --git a/pidgin.changes b/pidgin.changes index 2256d8f..7e6588d 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 6 11:58:28 CEST 2009 - vuntz@novell.com + +- Respin pidgin-gnome-keyring.patch that doesn't apply with new + patch package. + ------------------------------------------------------------------- Mon Mar 16 14:46:16 CET 2009 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index 3a60300..b77ea41 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -21,7 +21,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.5.5 -Release: 2 +Release: 3 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -882,6 +882,9 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ %{_libdir}/pkgconfig/gnt.pc %changelog +* Mon Apr 06 2009 vuntz@novell.com +- Respin pidgin-gnome-keyring.patch that doesn't apply with new + patch package. * Mon Mar 16 2009 sbrabec@suse.cz - Added support for translation-update-upstream (FATE#301344). * Thu Mar 12 2009 sbrabec@suse.cz @@ -1144,7 +1147,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ * Added a log viewer * Added the ability to block/unblock buddies * Fixed a bug preventing finch working on x86_64 -* Wed Jan 09 2008 maw@suse.de +* Thu Jan 10 2008 maw@suse.de - Fix installation of Serbian (Latin script) translation data. * Sat Dec 08 2007 james@usr-local-bin.org - Update to version 2.3.1: @@ -1274,7 +1277,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \ * lots of bug fixed * Mon Jul 30 2007 maw@suse.de - Change some obsoletes and provides stuff. -* Mon Jul 23 2007 maw@suse.de +* Tue Jul 24 2007 maw@suse.de - Add includes.patch, fixing the build when new versions of evolution-data-server are installed. * Tue Jun 12 2007 ro@suse.de