diff --git a/pidgin-gnome-keyring.patch b/pidgin-gnome-keyring.patch index 11c8e2e..a949b16 100644 --- a/pidgin-gnome-keyring.patch +++ b/pidgin-gnome-keyring.patch @@ -17,7 +17,7 @@ Index: pidgin-2.4.2/configure.ac +if test "x$enable_gnome_keyring" = "xyes"; then + PKG_CHECK_MODULES(PURPLE_KEYRING, + gnome-keyring-1, -+ AC_DEFINE(VINO_ENABLE_KEYRING, [], [Set if we should use gnome-keyring])) ++ AC_DEFINE(PURPLE_ENABLE_KEYRING, [], [Set if we should use gnome-keyring])) +fi + diff --git a/pidgin.changes b/pidgin.changes index e548672..dfc6b8e 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 6 12:11:13 EST 2009 - jpr@novell.com + +- Fix keyring patch so the keyring paths actually get used + (bnc #327391) + ------------------------------------------------------------------- Tue Nov 25 10:22:44 CET 2008 - ro@suse.de diff --git a/pidgin.spec b/pidgin.spec index 74ee472..dfc1fae 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,7 +1,7 @@ # # spec file for package pidgin (Version 2.5.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.5.1 -Release: 3 +Release: 4 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -906,6 +906,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gnt.pc %changelog +* Tue Jan 06 2009 jpr@novell.com +- Fix keyring patch so the keyring paths actually get used + (bnc #327391) * Tue Nov 25 2008 ro@suse.de - comment out libpurple2-mono on ppc64 for the moment to fix build (no native mono on ppc64) @@ -1157,7 +1160,7 @@ rm -rf $RPM_BUILD_ROOT + Fixed bug bnc #308639 * Thu Sep 06 2007 sbrabec@suse.cz - Dropped gaim-compat package, fixed provides/obsoletes (#296952). -* Fri Aug 17 2007 ro@suse.de +* Thu Aug 16 2007 ro@suse.de - fix requires: require libpurple-lang instead of pidgin-lang * Tue Aug 14 2007 maw@suse.de - Use %%lang_package -n libpurple instead. @@ -1179,7 +1182,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jul 23 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 +* Mon Jun 11 2007 ro@suse.de - avoid string compare with char literal (use strcmp) * Thu May 31 2007 sbrabec@suse.cz - Updated to version 2.0.1: