From 42841ab2af9a19819a0188446242f0abf5f4478f5487011b894eb02275e7d39a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 14 Jun 2007 14:05:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=4 --- pidgin-stringcompare.patch | 11 +++++++++++ pidgin.changes | 5 +++++ pidgin.spec | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pidgin-stringcompare.patch diff --git a/pidgin-stringcompare.patch b/pidgin-stringcompare.patch new file mode 100644 index 0000000..875957c --- /dev/null +++ b/pidgin-stringcompare.patch @@ -0,0 +1,11 @@ +--- libpurple/protocols/oscar/oscar.c ++++ libpurple/protocols/oscar/oscar.c +@@ -1788,7 +1788,7 @@ + + if (have_status_message) + { +- if ((status_id == OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL)) ++ if (!strcmp(status_id,OSCAR_STATUS_ID_AVAILABLE) && (info->itmsurl != NULL)) + { + char *itmsurl; + itmsurl = oscar_encoding_to_utf8(info->itmsurl_encoding, diff --git a/pidgin.changes b/pidgin.changes index b234bbc..823741e 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 12 01:54:48 CEST 2007 - ro@suse.de + +- avoid string compare with char literal (use strcmp) + ------------------------------------------------------------------- Thu May 31 11:21:27 CEST 2007 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index d8afda5..0dcdb20 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -13,7 +13,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.0.1 -Release: 1 +Release: 14 License: GNU General Public License (GPL) Group: Productivity/Networking/AOLInstantMessenger URL: http://www.pidgin.im/ @@ -26,6 +26,7 @@ Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch Patch7: pidgin-check.patch +Patch8: pidgin-stringcompare.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files # Product specific lines @@ -755,6 +756,7 @@ Authors: %patch4 -p1 %patch5 -p1 %patch7 +%patch8 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* sed -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac @@ -934,6 +936,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gaim-text %changelog +* Tue Jun 12 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: * Over 100 bugs fixed.