SHA256
1
0
forked from pool/pidgin

Accepting request 98941 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/98941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=83
This commit is contained in:
Stephan Kulow 2012-01-05 18:14:50 +00:00 committed by Git OBS Bridge
parent 0c4900a826
commit 4f75d4d61a
5 changed files with 58 additions and 20 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
size 9941288

3
pidgin-2.10.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
size 9961580

13
pidgin-glib-2.31.patch Normal file
View File

@ -0,0 +1,13 @@
Index: pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
===================================================================
--- pidgin-2.10.0.orig/libpurple/protocols/mxit/formcmds.c
+++ pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
@@ -25,7 +25,7 @@
#include "internal.h"
-#include <glib/gprintf.h>
+#include <glib.h>
#include "purple.h"

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Sat Dec 10 21:27:20 UTC 2011 - gankov@opensuse.org
- Update to version 2.10.1:
+ AIM and ICQ:
- Fix remotely-triggerable crashes by validating strings in a
few messages related to buddy list management.
+ Bonjour:
- IPv6 fixes
+ Gadu-Gadu:
- Fix problems linking against GnuTLS.
+ IRC:
- Fix a memory leak when admitting UTF-8 text with a non-UTF-8
primary encoding.
+ Jabber:
- Fix crashes and memory leaks when receiving malformed voice
and video requests.
+ Sametime:
- Separate "username" and "server" when adding new Sametime
accounts.
- Fix compilation in Visual C++.
+ SILC:
- Fix CVE-2011-3594, by UTF-8 validating incoming messages
before passing them to glib or libpurple.
+ Yahoo!:
- Fetch buddy icons in some cases where we previously weren't.
-------------------------------------------------------------------
Mon Nov 28 23:24:22 UTC 2011 - dimstar@opensuse.org
- Add pidgin-glib-2.31.patch: Fix build with glib 2.31.
-------------------------------------------------------------------
Sun Nov 27 06:44:46 UTC 2011 - coolo@suse.com

View File

@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%if 0%{?suse_version} > 1010 && 0%{?suse_version} < 1140
%define with_mono 1
%else
@ -25,10 +23,10 @@
Name: pidgin
Summary: Multiprotocol Instant Messaging Client
Version: 2.10.0
Release: 1
License: GPLv2+
License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger
Version: 2.10.1
Release: 0
Url: http://www.pidgin.im/
Source: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
Source1: pidgin-NLD-smiley-theme.tar.bz2
@ -45,6 +43,8 @@ Patch14: pidgin-mono-buildfix.patch
Patch15: pidgin-fix-perl-build.patch
# PATCH-FIX-UPSTREAM pidgin-nm09-more.patch vuntz@opensuse.org -- Fix to use new NM signal name http://developer.pidgin.im/ticket/13859
Patch16: pidgin-nm09-more.patch
# PATCH-FIX-UPSTREAM pidgin-glib-2.31.patch http://developer.pidgin.im/ticket/14773 dimstar@opensuse.org -- Fix build with glib 2.31.
Patch17: pidgin-glib-2.31.patch
# Can use external libzephyr
BuildRequires: cyrus-sasl-devel
BuildRequires: dbus-1-devel
@ -129,7 +129,8 @@ BuildRequires: gstreamer010-plugins-base-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: silc-toolkit-devel
%else
BuildRequires: dbus-1-devel dbus-1-glib
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib
%endif
%if %suse_version > 1020
BuildRequires: fdupes
@ -138,7 +139,8 @@ BuildRequires: libnotify-devel
%if %suse_version > 1030
BuildRequires: libavahi-glib-devel
%else
BuildRequires: avahi-devel avahi-glib
BuildRequires: avahi-devel
BuildRequires: avahi-glib
%endif
%if %suse_version > 1020
Requires: openssl-certs
@ -172,14 +174,12 @@ SIMPLE, MXit, MySpaceIM, and Zephyr. It can support many more with
plugins.
%package devel
License: GPLv2+
#'
Summary: Development Headers, Documentation, and Libraries for Pidgin
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version} glib2-devel gtk2-devel libpurple-devel = %{version}
%package -n libpurple
License: GPLv2+
Summary: GLib-based Instant Messenger Library
Group: System/Libraries
# Not really required, but standard Jabber accounts require it, if compiled with SASL support.
@ -195,7 +195,6 @@ Recommends: libpurple-lang
%endif
%package -n libpurple-devel
License: GPLv2+
Summary: Development Headers, Documentation, and Libraries for libpurple
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version} NetworkManager-devel NetworkManager-glib glib2-devel libxml2-devel
@ -217,14 +216,12 @@ Obsoletes: gaim-unstable-devel < 2.0.0
%if %suse_version >= 1030
%package -n libpurple-meanwhile
License: GPLv2+
Summary: Lotus Sametime Plugin for Pidgin Using the Meanwhile Library
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version}
%endif
%package evolution
License: GPLv2+
Summary: Evolution integration plugin for Pidgin
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@ -233,21 +230,18 @@ Supplements: packageand(%{name}:evolution-data-server)
%if %with_mono
%package -n libpurple-mono
License: GPLv2+
Summary: Mono .NET Plugin Support for Pidgin
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version}
%endif
%package -n libpurple-tcl
License: GPLv2+
Summary: TCL Plugin Support for Pidgin
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version}
Supplements: packageand(libpurple:tcl)
%package -n finch
License: GPLv2+
Summary: Text-Based User Interface for Pidgin Instant Messaging Client
Group: Productivity/Networking/Instant Messenger
Requires: libpurple = %{version}
@ -255,7 +249,6 @@ Obsoletes: gaim-unstable-text < 2.0.0
Provides: gaim-unstable-text
%package -n finch-devel
License: GPLv2+
Summary: Headers etc. for finch Stuffs
Group: Productivity/Networking/Instant Messenger
Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} ncurses-devel
@ -265,7 +258,6 @@ Obsoletes: gaim-unstable-text-devel
%if 0%{?suse_version} > 1140
%package -n libpurple-branding-upstream
License: GPLv2+
Summary: GLib-based Instant Messenger Library -- Upstream default configuration
Group: System/Libraries
Requires: libpurple = %{version}
@ -366,6 +358,7 @@ translation-update-upstream
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
# Change Myanmar/Myanmar to Myanmar:
rename my_MM my po/my_MM.*
%{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac