From dbe221d92ec0f2ed328fedff741dbb3140f86e23 Mon Sep 17 00:00:00 2001 From: Alexander Kazancev Date: Tue, 28 Aug 2012 07:26:09 +0000 Subject: [PATCH 1/6] Updated pidgin.spec --- pidgin.spec | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pidgin.spec b/pidgin.spec index fa0ad99..da1737b 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,11 +1,4 @@ -%if %mandriva_branch == Cooker -# Cooker -%define release %mkrel 2 -%else -# Old distros -%define subrel 2 -%define release %mkrel 0 -%endif +%define release 3 %define major 0 %define libname %mklibname purple %{major} @@ -27,10 +20,6 @@ %define build_mono 0 %endif -%if %mdvver < 201020 -%define build_vv 0 -%endif - %{?_without_evolution: %{expand: %%global build_evolution 0}} %{?_with_evolution: %{expand: %%global build_evolution 1}} @@ -139,7 +128,7 @@ BuildConflicts: silc-toolkit-devel BuildRequires: mono-devel %endif %if %build_vv -BuildRequires: farsight2-devel >= 0.0.9 +BuildRequires: pkgconfig(farsight2-0.10) Suggests: gstreamer0.10-farsight2 %endif Obsoletes: hackgaim <= 0.60 gaim From c83d2f1a82adb814f475daa10fbbd8cdaa94415f Mon Sep 17 00:00:00 2001 From: Alexander Kazancev Date: Tue, 28 Aug 2012 07:36:24 +0000 Subject: [PATCH 2/6] Updated pidgin.spec --- pidgin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidgin.spec b/pidgin.spec index da1737b..763366e 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -128,7 +128,7 @@ BuildConflicts: silc-toolkit-devel BuildRequires: mono-devel %endif %if %build_vv -BuildRequires: pkgconfig(farsight2-0.10) +BuildRequires: farsight2-devel >= 0.0.31 Suggests: gstreamer0.10-farsight2 %endif Obsoletes: hackgaim <= 0.60 gaim From 6223801a9876a76922980c52e8fd65f14575f90f Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 6 Sep 2012 23:35:43 +1100 Subject: [PATCH 3/6] LOG New version 2.10.6 (sync with Cooker), drop security patches (merged in upstream) --- .abf.yml | 2 +- pidgin-2.10.1-fix-perl-module-build.patch | 32 + ...add-soname-to-liboscar-and-libjabber.patch | 22 + pidgin-CVE-2012-2214.patch | 75 -- pidgin-CVE-2012-2318.patch | 64 -- pidgin.spec | 696 +++++++++++++----- 6 files changed, 551 insertions(+), 340 deletions(-) create mode 100644 pidgin-2.10.1-fix-perl-module-build.patch create mode 100644 pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch delete mode 100644 pidgin-CVE-2012-2214.patch delete mode 100644 pidgin-CVE-2012-2318.patch diff --git a/.abf.yml b/.abf.yml index 501384c..3099f53 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "pidgin-2.10.2.tar.bz2": 5ec0a8a51a9d237f1eaf27bf8858599e8fa6ecce + "pidgin-2.10.6.tar.bz2": a0532e7ba2acd205d6a5a4e3624156a980fe3d43 diff --git a/pidgin-2.10.1-fix-perl-module-build.patch b/pidgin-2.10.1-fix-perl-module-build.patch new file mode 100644 index 0000000..34a3763 --- /dev/null +++ b/pidgin-2.10.1-fix-perl-module-build.patch @@ -0,0 +1,32 @@ +--- pidgin-2.10.1/libpurple/Makefile.am~ 2011-12-06 09:44:33.000000000 +0100 ++++ pidgin-2.10.1/libpurple/Makefile.am 2011-12-13 17:14:37.492942189 +0100 +@@ -32,7 +32,7 @@ endif + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = purple.pc + +-SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example ++SUBDIRS = $(GCONF_DIR) protocols ciphers . plugins tests example + + purple_coresources = \ + account.c \ +--- pidgin-2.10.1/libpurple/plugins/perl/Makefile.am~ 2011-12-06 09:44:33.000000000 +0100 ++++ pidgin-2.10.1/libpurple/plugins/perl/Makefile.am 2011-12-13 17:15:09.437943687 +0100 +@@ -5,7 +5,7 @@ perl_dirs = common + plugin_LTLIBRARIES = perl.la + + perl_la_LDFLAGS = -module -avoid-version +-perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) ++perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) $(top_builddir)/libpurple/libpurple.la + perl_la_SOURCES = \ + perl.c \ + perl-common.c \ +@@ -15,7 +15,8 @@ perl_la_SOURCES = \ + + perl_la_DEPENDENCIES = \ + .libs/libperl_orig.a \ +- .libs/DynaLoader.a ++ .libs/DynaLoader.a \ ++ $(top_builddir)/libpurple/libpurple.la + + .libs/libperl_orig.a: + @mkdir -p .libs diff --git a/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch b/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch new file mode 100644 index 0000000..33fcfb8 --- /dev/null +++ b/pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch @@ -0,0 +1,22 @@ +--- pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am.soname~ 2012-03-16 20:23:40.918123912 +0100 ++++ pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am 2012-03-16 20:24:42.355199920 +0100 +@@ -93,7 +93,7 @@ JABBERSOURCES = \ + + AM_CFLAGS = $(st) + +-libjabber_la_LDFLAGS = -module -avoid-version ++libjabber_la_LDFLAGS = -module -avoid-version -Wl,-soname=libjabber.so + libxmpp_la_LDFLAGS = -module -avoid-version + + if USE_CYRUS_SASL +--- pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am.soname~ 2012-03-16 20:15:58.733552100 +0100 ++++ pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am 2012-03-16 20:15:58.753552126 +0100 +@@ -52,7 +52,7 @@ AM_CFLAGS = $(st) + + libaim_la_LDFLAGS = -module -avoid-version + libicq_la_LDFLAGS = -module -avoid-version +-liboscar_la_LDFLAGS = -module -avoid-version ++liboscar_la_LDFLAGS = -module -avoid-version -Wl,-soname=liboscar.so + if STATIC_OSCAR + + st = -DPURPLE_STATIC_PRPL diff --git a/pidgin-CVE-2012-2214.patch b/pidgin-CVE-2012-2214.patch deleted file mode 100644 index dceb422..0000000 --- a/pidgin-CVE-2012-2214.patch +++ /dev/null @@ -1,75 +0,0 @@ -# -# -# patch "libpurple/proxy.c" -# from [2a1922d6f3744bc61c81543909324d38d741948f] -# to [df78b061b3bc73de02f1a4ad29357497322aaf89] -# -============================================================ ---- libpurple/proxy.c 2a1922d6f3744bc61c81543909324d38d741948f -+++ libpurple/proxy.c df78b061b3bc73de02f1a4ad29357497322aaf89 -@@ -59,6 +59,8 @@ struct _PurpleProxyConnectData { - */ - GSList *hosts; - -+ PurpleProxyConnectData *child; -+ - /* - * All of the following variables are used when establishing a - * connection through a proxy. -@@ -559,6 +561,12 @@ purple_proxy_connect_data_disconnect(Pur - static void - purple_proxy_connect_data_disconnect(PurpleProxyConnectData *connect_data, const gchar *error_message) - { -+ if (connect_data->child != NULL) -+ { -+ purple_proxy_connect_cancel(connect_data->child); -+ connect_data->child = NULL; -+ } -+ - if (connect_data->inpa > 0) - { - purple_input_remove(connect_data->inpa); -@@ -2417,13 +2425,20 @@ static void socks5_connected_to_proxy(gp - /* This is the PurpleProxyConnectData for the overall SOCKS5 connection */ - PurpleProxyConnectData *connect_data = data; - -+ purple_debug_error("proxy", "Connect Data is %p\n", connect_data); -+ - /* Check that the overall SOCKS5 connection wasn't cancelled while we were - * connecting to it (we don't have a way of associating the process of - * connecting to the SOCKS5 server to the overall PurpleProxyConnectData) - */ -- if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data)) -+ if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data)) { -+ purple_debug_error("proxy", "Data had gone out of scope :(\n"); - return; -+ } - -+ /* Break the link between the two PurpleProxyConnectDatas */ -+ connect_data->child = NULL; -+ - if (error_message != NULL) { - purple_debug_error("proxy", "Unable to connect to SOCKS5 host.\n"); - connect_data->connect_cb(connect_data->data, source, error_message); -@@ -2486,10 +2501,7 @@ purple_proxy_connect_socks5_account(void - return NULL; - } - -- /* The API doesn't really provide us with a way to cancel the specific -- * proxy connection attempt (account_proxy_conn_data) when the overall -- * SOCKS5 connection (connect_data) attempt is cancelled :( -- */ -+ connect_data->child = account_proxy_conn_data; - - handles = g_slist_prepend(handles, connect_data); - -@@ -2499,6 +2511,8 @@ purple_proxy_connect_cancel(PurpleProxyC - void - purple_proxy_connect_cancel(PurpleProxyConnectData *connect_data) - { -+ g_return_if_fail(connect_data != NULL); -+ - purple_proxy_connect_data_disconnect(connect_data, NULL); - purple_proxy_connect_data_destroy(connect_data); - } - diff --git a/pidgin-CVE-2012-2318.patch b/pidgin-CVE-2012-2318.patch deleted file mode 100644 index 910ce17..0000000 --- a/pidgin-CVE-2012-2318.patch +++ /dev/null @@ -1,64 +0,0 @@ -# -# -# patch "libpurple/protocols/msn/msg.c" -# from [94fe3963ccab9a56f0311277c241efbc0242a4d6] -# to [417ae5cb2f85d578b7e00fcb9c450dad1171c499] -# -============================================================ ---- libpurple/protocols/msn/msg.c 94fe3963ccab9a56f0311277c241efbc0242a4d6 -+++ libpurple/protocols/msn/msg.c 417ae5cb2f85d578b7e00fcb9c450dad1171c499 -@@ -257,13 +257,47 @@ msn_message_parse_payload(MsnMessage *ms - msg->body[msg->body_len] = '\0'; - } - -- if ((!content_type || !strcmp(content_type, "text/plain")) -- && msg->charset == NULL) { -- char *body = g_convert(msg->body, msg->body_len, "UTF-8", -- "ISO-8859-1", NULL, &msg->body_len, NULL); -- g_free(msg->body); -- msg->body = body; -- msg->charset = g_strdup("UTF-8"); -+ if (msg->body && content_type && purple_str_has_prefix(content_type, "text/")) { -+ char *body = NULL; -+ -+ if (msg->charset == NULL || g_str_equal(msg->charset, "UTF-8")) { -+ /* Charset is UTF-8 */ -+ if (!g_utf8_validate(msg->body, msg->body_len, NULL)) { -+ purple_debug_warning("msn", "Message contains invalid " -+ "UTF-8. Attempting to salvage.\n"); -+ body = purple_utf8_salvage(msg->body); -+ payload_len = strlen(body); -+ } -+ } else { -+ /* Charset is something other than UTF-8 */ -+ GError *err = NULL; -+ body = g_convert(msg->body, msg->body_len, "UTF-8", -+ msg->charset, NULL, &payload_len, &err); -+ if (!body || err) { -+ purple_debug_warning("msn", "Unable to convert message from " -+ "%s to UTF-8: %s\n", msg->charset, -+ err ? err->message : "Unknown error"); -+ if (err) -+ g_error_free(err); -+ -+ /* Fallback to ISO-8859-1 */ -+ g_free(body); -+ body = g_convert(msg->body, msg->body_len, "UTF-8", -+ "ISO-8859-1", NULL, &payload_len, NULL); -+ if (!body) { -+ g_free(msg->body); -+ msg->body = NULL; -+ msg->body_len = 0; -+ } -+ } -+ } -+ -+ if (body) { -+ g_free(msg->body); -+ msg->body = body; -+ msg->body_len = payload_len; -+ msn_message_set_charset(msg, "UTF-8"); -+ } - } - - g_free(tmp_base); diff --git a/pidgin.spec b/pidgin.spec index 763366e..9b24bde 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,53 +1,49 @@ -%define release 3 +#gw 2.7.0, the yahoo plugin does not build otherwise +%define _disable_ld_no_undefined 1 %define major 0 %define libname %mklibname purple %{major} +%define libclient %mklibname purple-client %{major} +%define libgnt %mklibname gnt %{major} %define develname %mklibname purple -d -%define console_app finch -%define lib_console_app %mklibname %{console_app} %{major} - -%define build_evolution 1 +%define build_evolution 0 %define build_silc 1 %define build_meanwhile 1 -%define build_networkmanager 0 +%define build_networkmanager 1 +%define build_perl 1 #gw http://developer.pidgin.im/ticket/11936#comment:1 %define build_mono 0 %define build_vv 1 +# (tpg) libgadu is now in main, pidgin's one is really old +# gw pidgin's internal libgadu was updated recently +# build against external version if possible, keep in mind older distros +# might have older libgadu +#gw configure check is used unless --with-* options are used: %define build_libgadu 0 %ifarch mips mipsel %define build_mono 0 %endif -%{?_without_evolution: %{expand: %%global build_evolution 0}} -%{?_with_evolution: %{expand: %%global build_evolution 1}} +%if %mdvver < 201020 +%define build_vv 0 +%endif -%{?_without_silc: %{expand: %%global build_silc 0}} -%{?_with_silc: %{expand: %%global build_silc 1}} - -%{?_without_meanwhile: %{expand: %%global build_meanwhile 0}} -%{?_with_meanwhile: %{expand: %%global build_meanwhile 1}} - -%{?_without_networkmanager: %{expand: %%global build_networkmanager 0}} -%{?_with_networkmanager: %{expand: %%global build_networkmanager 1}} - -%{?_without_mono: %{expand: %%global build_mono 0}} -%{?_with_mono: %{expand: %%global build_mono 1}} - -%{?_without_libgadu: %{expand: %%global build_libgadu 0}} -%{?_with_libgadu: %{expand: %%global build_libgadu 1}} +%if %mdvver <= 201100 +%define build_evolution 1 +%endif Summary: A GTK+ based multiprotocol instant messaging client Name: pidgin -Version: 2.10.2 -Release: %release +Version: 2.10.6 +Release: 2 Group: Networking/Instant messaging License: GPLv2+ URL: http://www.pidgin.im/ Source0: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 #gw from Fedora: generate one time passwords -Source2: one_time_password.c +Source2: one_time_password.c Patch0: pidgin-2.7.0-smiley.patch Patch3: pidgin-2.4.2-set-jabber-as-module.patch #gw fix build with mono 2.6.4 which does not have the nessessary glib dep @@ -58,87 +54,88 @@ Patch6: pidgin-2.7.0-mono-build.patch Patch111: %{name}-2.8.0-reread-resolvconf.patch Patch115: %{name}-2.10.0-gg-search-by-uin.patch Patch116: %{name}-2.8.0-gg-disconnect.patch +Patch117: pidgin-2.10.1-fix-perl-module-build.patch +# since libtool drops soname for unversioned modules now, we need to explicitly +# add soname to plugins that other plugins links against it +Patch118: pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch -Patch200: %{name}-CVE-2012-2214.patch -Patch201: %{name}-CVE-2012-2318.patch -BuildRequires: automake +BuildRequires: desktop-file-utils +BuildRequires: doxygen +BuildRequires: GConf2 +BuildRequires: graphviz BuildRequires: intltool -BuildRequires: autoconf -BuildRequires: libxext-devel -BuildRequires: libsm-devel -BuildRequires: libice-devel -BuildRequires: libx11-devel -BuildRequires: gtk+2-devel >= 2.10 -Buildrequires: gtkspell-devel >= 2.0.2 -Buildrequires: sqlite3-devel -Buildrequires: libncursesw-devel -#gw for finch: -Buildrequires: python-devel -# (tpg) libgadu is now in main, pidgin's one is really old -# gw pidgin's internal libgadu was updated recently -# build against external version if possible, keep in mind older distros -# might have older libgadu -%if %build_libgadu -#gw configure check is used unless --with-* options are used: -Buildrequires: libgadu-devel >= 1.11.0 -%endif -#gw we have networkmanager only in contribs: -%if %build_networkmanager -Buildrequires: networkmanager-devel -%endif -BuildRequires: libxscrnsaver-devel -BuildRequires: libgstreamer-devel >= 0.10 -BuildRequires: libgstreamer-plugins-base-devel -BuildRequires: libidn-devel -BuildRequires: perl-devel +BuildRequires: xsltproc +BuildRequires: expat-devel +BuildRequires: gettext-devel +BuildRequires: krb5-devel BuildRequires: tk-devel BuildRequires: tcl-devel -BuildRequires: startup-notification-devel >= 0.5 -BuildRequires: libnss-devel -BuildRequires: libnspr-devel -BuildRequires: krb5-devel -BuildRequires: libjack-devel -BuildRequires: libsamplerate-devel -BuildRequires: gettext-devel -BuildRequires: libexpat-devel -BuildRequires: avahi-glib-devel -BuildRequires: avahi-client-devel -BuildRequires: doxygen -BuildRequires: desktop-file-utils -BuildRequires: gnutls-devel -BuildRequires: dbus-devel >= 0.50 -BuildRequires: dbus-glib-devel -BuildRequires: graphviz -BuildRequires: libxslt-proc -BuildRequires: GConf2 -%if %build_meanwhile -BuildRequires: meanwhile-devel >= 1.0.0 +BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(gnutls) +BuildRequires: libgcrypt-devel +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(gtk+-2.0) +Buildrequires: pkgconfig(gtkspell-2.0) >= 2.0.2 +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.5 +Buildrequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(nspr) +%if %mdkversion >= 201100 +Buildrequires: pkgconfig(python) %else -BuildConflicts: meanwhile-devel +BuildRequires: python-devel +%endif +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(sm) +Buildrequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(x11) +%if %build_libgadu +Buildrequires: pkgconfig(libgadu) >= 1.11.0 +%endif +%if %build_networkmanager +Buildrequires: pkgconfig(libnm-util) +%endif +%if %build_meanwhile +BuildRequires: pkgconfig(meanwhile) >= 1.0.0 %endif %if %build_evolution -BuildRequires: evolution-data-server-devel +BuildRequires: pkgconfig(evolution-data-server-1.2) +BuildRequires: pkgconfig(libebook-1.2) +BuildRequires: pkgconfig(libedata-book-1.2) %endif %if %build_silc -BuildRequires: silc-toolkit-devel >= 0.9.12 -%else -BuildConflicts: silc-toolkit-devel +BuildRequires: pkgconfig(silc) >= 0.9.12 +BuildRequires: pkgconfig(silcclient) >= 0.9.12 +%endif +%if %build_perl +BuildRequires: perl-devel %endif %if %build_mono -BuildRequires: mono-devel +BuildRequires: pkgconfig(mono) %endif %if %build_vv -BuildRequires: farsight2-devel >= 0.0.31 +%if %mdvver >= 201200 +BuildRequires: pkgconfig(farstream-0.1) +Suggests: gstreamer0.10-farstream +%else +BuildRequires: pkgconfig(farsight2-0.10) Suggests: gstreamer0.10-farsight2 %endif -Obsoletes: hackgaim <= 0.60 gaim -Provides: hackgaim <= 0.60 gaim -Requires: %{libname} >= %{version}-%{release} +%endif + Requires: %{name}-i18n = %{version}-%{release} Requires: %{name}-plugins = %{version}-%{release} +Requires: %{name}-client >= %{version}-%{release} Requires: rootcerts Requires: xdg-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description Pidgin allows you to talk to anyone using a variety of messaging @@ -157,7 +154,7 @@ Microsoft Corporation, Yahoo! Inc., or ICQ Inc. %package plugins Summary: Pidgin plugins shared by the Purple and Finch Group: Networking/Instant messaging -Conflicts: %{name} < 2.4.1-3mdv +Conflicts: %{name} < 2.4.1-3 %description plugins This contains the parts of Pidgin that are shared between the Purple and @@ -166,9 +163,7 @@ Finch Instant Messengers. %package perl Summary: Purple extension, to use perl scripting Group: Networking/Instant messaging -Obsoletes: gaim-perl -Provides: gaim-perl -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description perl Purple can use perl script as plugin, this plugin enable them. @@ -176,9 +171,7 @@ Purple can use perl script as plugin, this plugin enable them. %package tcl Summary: Purple extension, to use tcl scripting Group: Networking/Instant messaging -Obsoletes: gaim-tcl -Provides: gaim-tcl -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description tcl Purple can use tcl script as plugin, this plugin enable them. @@ -187,9 +180,7 @@ Purple can use tcl script as plugin, this plugin enable them. %package gevolution Summary: Pidgin extension, for Evolution integration Group: Networking/Instant messaging -Obsoletes: gaim-gevolution -Provides: gaim-gevolution -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description gevolution This pidgin plugin allows you to have pidgin working together with evolution. @@ -198,9 +189,7 @@ This pidgin plugin allows you to have pidgin working together with evolution. %package silc Summary: Purple extension, to use SILC (Secure Internet Live Conferencing) Group: Networking/Instant messaging -Obsoletes: gaim-silc -Provides: gaim-silc -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description silc This purple plugin allows you to use SILC (Secure Internet Live Conferencing) @@ -209,12 +198,10 @@ plugin for live video conference. %package -n %{develname} Summary: Development files for pidgin Group: Development/GNOME and GTK+ -Requires: %{libname} = %{version}-%{release} -Requires: %{lib_console_app} = %{version}-%{release} -Requires: pidgin-client = %version-%release -Provides: libpidgin-devel = %{version}-%{release} +Requires: %{libname} >= %{version}-%{release} +Requires: %{libgnt} = %{version}-%{release} +Requires: %{libclient} = %{version}-%{release} Provides: pidgin-devel = %{version}-%{release} -Obsoletes: gaim-devel %description -n %{develname} The pidgin-devel package contains the header files, developer @@ -229,31 +216,34 @@ Group: System/Libraries libpurple contains the core IM support for IM clients such as Pidgin and Finch. -libpurple supports a variety of messaging protocols including AIM, MSN, -Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, -Lotus Sametime, SILC, Simple and Zephyr. +%package -n %{libclient} +Summary: The libpurple-client library for %{name}-client +Group: System/Libraries +Conflicts: %{name}-client < 2.10.1-1 -%package -n %{lib_console_app} +%description -n %{libclient} +libpurple-client contains the shared library for %{name}-client. + +%package -n %{libgnt} Summary: The libgnt library for the Finch IM client Group: System/Libraries -Conflicts: %mklibname gaim 0 +%rename %{_lib}finch0 -%description -n %{lib_console_app} +%description -n %{libgnt} libgnt contains the core IM support for the Finch IM client. libgnt supports a variety of messaging protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and Zephyr. -%package -n %{console_app} +%package -n finch Summary: A text-based user interface for Pidgin Group: Networking/Instant messaging -Requires: %{name} = %{version}-%{release} -Requires: %{lib_console_app} >= %{version}-%{release} -Requires: %{name}-i18n = %{version}-%{release} -Requires: %{name}-plugins = %{version}-%{release} +Requires: %{name}-i18n >= %{version}-%{release} +Requires: %{name}-plugins >= %{version}-%{release} +Requires: %{name}-client >= %{version}-%{release} -%description -n %{console_app} +%description -n finch A text-based user interface for using libpurple. This can be run from a standard text console or from a terminal within X Windows. It uses ncurses and our homegrown gnt library for drawing windows @@ -262,9 +252,7 @@ and text. %package bonjour Summary: Bonjour plugin for Purple Group: Networking/Instant messaging -Obsoletes: gaim-bonjour -Provides: gaim-bonjour -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description bonjour Bonjour plugin for purple. @@ -272,9 +260,7 @@ Bonjour plugin for purple. %package meanwhile Summary: Lotus Sametime Community Client plugin for Purple Group: Networking/Instant messaging -Obsoletes: gaim-meanwhile -Provides: gaim-meanwhile -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description meanwhile Lotus Sametime Community Client plugin for purple. @@ -283,9 +269,6 @@ Lotus Sametime Community Client plugin for purple. Summary: Plugin and sample client to control purple clients Group: Networking/Instant messaging Requires: dbus-python -Obsoletes: libgaim-remote0, gaim-client -Provides: libgaim-remote0, gaim-client -Requires: %{name} = %{version}-%{release} %description client Applications and library to control purple clients remotely. @@ -294,9 +277,7 @@ Applications and library to control purple clients remotely. %package mono Summary: Purple extension, to use Mono plugins Group: Networking/Instant messaging -Obsoletes: gaim-mono -Provides: gaim-mono -Requires: %{name} = %{version}-%{release} +Requires: %{name} >= %{version}-%{release} %description mono Purple can use plugins developed with Mono. @@ -305,28 +286,31 @@ Purple can use plugins developed with Mono. %package i18n Summary: Translation files for Pidgin/Finch Group: Networking/Instant messaging -Obsoletes: %{name} < 2.1.0 %description i18n This package contains translation files for Pidgin/Finch. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 -b .smiley %patch3 -p0 %patch6 -p1 %patch111 -p1 -b .reread-resolvconf %patch115 -p1 -b .gg-search %patch116 -p1 -%patch200 -p0 -%patch201 -p0 +%patch117 -p1 -b .perl_buildfix~ +%patch118 -p1 -b .soname~ + +autoreconf -fi -Im4macros %build -autoreconf -fi -Im4macros -#gw 2.7.0, the yahoo plugin does not build otherwise -%define _disable_ld_no_undefined 1 %configure2_5x \ --enable-gnutls=yes \ +%if %build_perl + --enable-perl \ +%else + --disable-perl \ +%endif %if %build_mono --enable-mono \ %else @@ -341,12 +325,14 @@ autoreconf -fi -Im4macros --enable-gevolution \ %endif %if ! %build_vv - --disable-vv \ + --disable-vv \ %endif --without-krb4 \ --enable-cap \ - --with-system-ssl-certs=%_sysconfdir/pki/tls/rootcerts/ \ - --disable-static --disable-schemas-install + --with-system-ssl-certs=%{_sysconfdir}/pki/tls/rootcerts/ \ + --disable-static \ + --disable-schemas-install + %make # one_time_password plugin, to be merged upstream soon @@ -355,7 +341,6 @@ pushd libpurple/plugins/ make one_time_password.so popd - %install rm -rf %{buildroot} @@ -363,7 +348,6 @@ rm -rf %{buildroot} install -m 0755 libpurple/plugins/one_time_password.so %{buildroot}%{_libdir}/purple-2/ - desktop-file-install \ --remove-category="Application" \ --add-category="GTK" \ @@ -373,19 +357,18 @@ desktop-file-install \ # remove files not bundled rm -f %{buildroot}%{_libdir}/*/*.la -rm -f %buildroot%_prefix/*/perl5/*/perllocal.pod \ - %buildroot%_libdir/*/perl/auto/*/{.packlist,*.bs,autosplit.ix} +rm -f %{buildroot}%{_prefix}/*/perl5/*/perllocal.pod \ + %{buildroot}%{_libdir}/*/perl/auto/*/{.packlist,*.bs,autosplit.ix} +rm -f %{buildroot}%{_libdir}/*.*a %find_lang %{name} %preun %preun_uninstall_gconf_schemas purple -%clean -rm -rf %{buildroot} +%files i18n -f %{name}.lang %files -%defattr(-,root,root) %doc AUTHORS COPYRIGHT ChangeLog %doc NEWS README README.MTN doc/the_penguin.txt %{_mandir}/man1/pidgin.* @@ -421,7 +404,6 @@ rm -rf %{buildroot} %{_libdir}/pidgin/xmppdisco.so %files -n %{develname} -%defattr(-,root,root) %doc ChangeLog.API HACKING PLUGIN_HOWTO %{_includedir}/* %{_datadir}/aclocal/purple.m4 @@ -429,35 +411,38 @@ rm -rf %{buildroot} %{_libdir}/libpurple.so %{_libdir}/libgnt.so %{_libdir}/libpurple-client.so -%{_libdir}/lib*.la %files -n %{libname} -%defattr(-,root,root) %{_libdir}/libpurple.so.%{major}* -%files -n %{console_app} -%defattr(-, root, root) -%doc %{_mandir}/man1/%{console_app}.* -%{_bindir}/%{console_app} +%files -n %{libclient} +%{_libdir}/libpurple-client.so.%{major}* + +%files -n %{libgnt} +%{_libdir}/libgnt.so.%{major}* + +%files client +%{_bindir}/purple-remote +%{_bindir}/purple-send +%{_bindir}/purple-send-async +%{_bindir}/purple-client-example +%{_bindir}/purple-url-handler +%{_libdir}/purple-2/dbus-example.so + +%files -n finch +%doc %{_mandir}/man1/finch.* +%{_bindir}/finch %{_libdir}/finch/ %{_libdir}/gnt/ -%files -n %{lib_console_app} -%defattr(-, root, root) -%{_libdir}/libgnt.so.%{major}* - -%files bonjour -%defattr(-,root,root) -%{_libdir}/purple-2/libbonjour.so - +%if %build_perl %files perl -%defattr(-,root,root) %doc doc/PERL-HOWTO.dox -%dir %_libdir/%name/perl -%_libdir/%name/perl/Pidgin.pm -%dir %_libdir/%name/perl/auto -%dir %_libdir/%name/perl/auto/Pidgin/ -%_libdir/%name/perl/auto/Pidgin/Pidgin.so +%dir %{_libdir}/%{name}/perl +%{_libdir}/%{name}/perl/Pidgin.pm +%dir %{_libdir}/%{name}/perl/auto +%dir %{_libdir}/%{name}/perl/auto/Pidgin/ +%{_libdir}/%{name}/perl/auto/Pidgin/Pidgin.so %dir %{_libdir}/purple-2/perl %{_libdir}/purple-2/perl/Purple.pm %dir %{_libdir}/purple-2/perl/auto @@ -465,52 +450,38 @@ rm -rf %{buildroot} %{_libdir}/purple-2/perl/auto/Purple/Purple.so %{_libdir}/purple-2/perl.so %{_mandir}/man3*/* +%endif + +%files bonjour +%{_libdir}/purple-2/libbonjour.so %files tcl -%defattr(-,root,root) %doc doc/TCL-HOWTO.dox %{_libdir}/purple-2/tcl.so %if %build_silc %files silc -%defattr(-,root,root) %doc libpurple/protocols/silc/README %{_libdir}/purple-2/libsilcpurple.so %endif %if %build_evolution %files gevolution -%defattr(-,root,root) %{_libdir}/%{name}/gevolution.so %endif %if %build_meanwhile %files meanwhile -%defattr(-,root,root) %{_libdir}/purple-2/libsametime.so %endif -%files client -%defattr(-,root,root) -%{_bindir}/purple-remote -%{_bindir}/purple-send -%{_bindir}/purple-send-async -%{_bindir}/purple-client-example -%{_bindir}/purple-url-handler -%{_libdir}/libpurple-client.so.0* -%{_libdir}/purple-2/dbus-example.so - %if %build_mono %files mono -%defattr(-,root,root) %{_libdir}/purple-2/mono.so %{_libdir}/purple-2/*.dll %endif -%files i18n -f %{name}.lang - %files plugins -%defattr(-,root,root) %dir %{_libdir}/purple-2 %{_libdir}/purple-2/autoaccept.so %{_libdir}/purple-2/buddynote.so @@ -541,28 +512,68 @@ rm -rf %{buildroot} %{_libdir}/purple-2/ssl-nss.so %{_libdir}/purple-2/ssl.so %{_libdir}/purple-2/statenotify.so -%dir %_datadir/purple/ -%dir %_datadir/purple/ca-certs -%_datadir/purple/ca-certs/AOL* -%_datadir/purple/ca-certs/Microsoft* -%_datadir/purple/ca-certs/VeriSign* -%_datadir/purple/ca-certs/DigiCert* +%dir %{_datadir}/purple/ +%dir %{_datadir}/purple/ca-certs +%{_datadir}/purple/ca-certs/AOL* +%{_datadir}/purple/ca-certs/Microsoft* +%{_datadir}/purple/ca-certs/VeriSign* +%{_datadir}/purple/ca-certs/DigiCert* + %changelog -* Wed May 30 2012 Danil Leontiev 2.10.2-0.2 -- Added patches for CVE-2012-2214, CVE-2012-2318 +* Tue Jul 10 2012 Götz Waschk 2.10.6-1mdv2012.0 ++ Revision: 808702 +- add missing gcrypt build dev for gnutls (on cooker) +- readd farsight2 dep from 2011 builds +- update to new version 2.10.6 -* Thu Mar 15 2012 Oden Eriksson 2.10.2-0.1 -- 2.10.2 + + Oden Eriksson + - 2.10.5 -* Thu Dec 08 2011 Oden Eriksson 2.10.1-0.1 -- 2.10.1 +* Wed May 09 2012 Götz Waschk 2.10.4-1 ++ Revision: 797778 +- disable evolution support for Cooker +- update to new version 2.10.4 -* Sat Sep 17 2011 Oden Eriksson 2.10.0-0.1 -- built for updates +* Tue Mar 27 2012 Sergey Zhemoitel 2.10.3-1 ++ Revision: 787438 +- update to 2.10.3 -* Tue Sep 06 2011 Oden Eriksson 2.10.0-3mdv2012.0 +* Fri Mar 16 2012 Per Øyvind Karlsen 2.10.2-2 ++ Revision: 785409 +- explicitly add soname to liboscar.so & libjabber.so, since we link other + plugins against them, fixing dependencies generated (P118) + +* Wed Mar 14 2012 Sergey Zhemoitel 2.10.2-1 ++ Revision: 785022 +- release up to 2.10.2 + +* Tue Dec 13 2011 Per Øyvind Karlsen 2.10.1-2 ++ Revision: 740742 +- fix perl module build (P117) + +* Mon Dec 12 2011 Matthew Dawkins 2.10.1-1 ++ Revision: 740482 +- last fix for requires +- pidgin & finch req client not the otherway around +- added build_perl for broken perl build +- fixed BRs +- major spec clean up +- split out purple-client lib +- cleans up requires for devel pkg +- converted BRs to pkgconfig provides +- enabled NM build, NM is now in main +- removed pre200900 Obsoletes/Provides +- renamed libfinch0 to proper lib name libgnt0 +- removed dup requires for lib pkgs +- removed is this Cooker + + + Oden Eriksson + - 2.10.1 + - various fixes + +* Tue Sep 06 2011 Oden Eriksson 2.10.0-3 + Revision: 698448 - make it backportable again @@ -1167,3 +1178,288 @@ rm -rf %{buildroot} - gaim now names pidgin - gaim now names pidgin + +* Thu Feb 01 2007 Götz Waschk 2.0.0-2.beta6.2mdv2007.0 ++ Revision: 115818 +- fix mono example plugins and reenable mono support +- fix deps between the subpackages, as long as it is a prerelease + +* Fri Jan 19 2007 Götz Waschk 1:2.0.0-2.beta6.1mdv2007.1 ++ Revision: 110627 +- new version +- disable mono, it currently does not build +- drop patches 104, 105, 106, 107, 108, 110, 112, 150, 152, 153 +- add new plugins + +* Wed Jan 10 2007 Götz Waschk 1:2.0.0-2.beta5.6mdv2007.1 ++ Revision: 107128 +- port a few bug fixes from Fedora + +* Fri Dec 01 2006 Pascal Terjan 1:2.0.0-2.beta5.5mdv2007.1 ++ Revision: 89504 +- Drop the threads patch, it is now initialized correctly, and initializing it twice now aborts + +* Wed Nov 29 2006 Götz Waschk 1:2.0.0-2.beta5.4mdv2007.1 ++ Revision: 88289 +- bot rebuild +- fix buildrequires +- rebuild + +* Sat Nov 11 2006 Götz Waschk 1:2.0.0-2.beta5.1mdv2007.0 ++ Revision: 81050 +- new version +- readd source signature +- update file list + +* Sat Oct 21 2006 Götz Waschk 1:2.0.0-2.beta4.2mdv2007.1 ++ Revision: 71560 +- readd dbus thread fix + +* Fri Oct 20 2006 Götz Waschk 1:2.0.0-2.beta4.1mdv2007.1 ++ Revision: 71292 +- Import gaim + +* Fri Oct 20 2006 Götz Waschk 2.0.0-2.beta4.1mdv2007.1 +- fix buildrequires +- drop patch 1 +- unpack patch +- new version + +* Wed Aug 23 2006 Pascal Terjan 1:2.0.0-2.beta3.1.1mdv2007.0 +- Beta 3.1... + +* Tue Aug 15 2006 Götz Waschk 2.0.0-1.beta3.12mdv2007.0 +- fix buildrequires + +* Sun Aug 13 2006 Pascal Terjan 1:2.0.0-1.beta3.11mdv2007.0 +- Initialize threads as gnomevfs now uses dbus (P1) + +* Thu Aug 03 2006 Frederic Crozat 1:2.0.0-1.beta3.9mdv2007.0 +- Rebuild with latest dbus + +* Wed Jul 26 2006 Götz Waschk 2.0.0-1.beta3.8mdv2007.0 +- rebuild for new e-d-s + +* Sun Jul 16 2006 Nicolas Lécureuil 1:2.0.0-0.beta3.7mdv2007.0 +- XDG menu + +* Tue May 02 2006 Götz Waschk 2.0.0-0.beta3.6mdk +- rebuild + +* Wed Apr 19 2006 Götz Waschk 2.0.0-0.beta3.5mdk +- build the mono package + +* Fri Apr 14 2006 Götz Waschk 2.0.0-0.beta3.4mdk +- add mono package + +* Thu Apr 13 2006 Götz Waschk 2.0.0-0.beta3.3mdk +- rebuild for new e-d-s + +* Fri Mar 31 2006 Götz Waschk 2.0.0-0.beta3.2mdk +- fix buildrequires + +* Thu Mar 30 2006 Götz Waschk 2.0.0-0.beta3.1mdk +- drop patch 1 +- new version + +* Tue Feb 14 2006 Götz Waschk 2.0.0-0.beta2.3mdk +- patch for new libortp, but disable vv + +* Wed Jan 25 2006 Götz Waschk 2.0.0-0.beta2.2mdk +- rebuild for new dbus + +* Tue Jan 24 2006 Götz Waschk 2.0.0-0.beta2.1mdk +- update patch 0 +- fix buildrequires +- new version + +* Mon Jan 02 2006 Pascal Terjan 1:2.0.0-0.beta1.5mdk +- fix dbus-example.so belonging to 2 subpackages + +* Sun Jan 01 2006 Oden Eriksson 1:2.0.0-0.beta1.4mdk +- rebuilt against soname aware deps (tcl/tk) +- fix deps + +* Sat Dec 24 2005 Pascal Terjan 1:2.0.0-0.beta1.3mdk +- fix missing %% +- don't build dbus and meanwhile on <= 2006.0 +- BuildRequires doxygen for documentation (thanx misc for the reports) + +* Thu Dec 22 2005 Pascal Terjan 1:2.0.0-0.beta1.2mdk +- Change libgaimremote to libgaim-client +- Buildconflicts with stuff we can't disable in configure + +* Sun Dec 18 2005 Pascal Terjan 1:2.0.0-0.beta1.1mdk +- 2.0.0 beta 1 +- Drop patch1 +- Drop patch2 (nas support no longer exists) +- Add Bonjour subpackage +- meanwhile is now included + +* Sun Oct 09 2005 Pascal Terjan 1:1.5.0-5mdk +- Rebuild for new evolution-data-server + +* Fri Sep 02 2005 Christiaan Welvaart 1.5.0-4mdk +- add BuildRequires: gettext-devel + +* Thu Sep 01 2005 Gwenole Beauchesne 1.5.0-3mdk +- fix build with nas support + +* Sat Aug 13 2005 Buchan Milne 1.5.0-2mdk +- use %%mkrel + +* Sat Aug 13 2005 Pascal Terjan 1:1.5.0-1mdk +- 1.5.0 + +* Sat Jul 09 2005 Pascal Terjan 1:1.4.0-1mdk +- 1.4.0 + +* Tue Jul 05 2005 Pascal Terjan 1:1.3.1-3mdk +- Don't duplicate libsilcgaim.so in main package and -silc + +* Sat Jun 18 2005 Andreas Hasenack 1:1.3.1-2mdk +- rebuilt without krb4 support + +* Sun Jun 12 2005 Pascal Terjan 1:1.3.1-1mdk +- 1.3.1 + +* Fri Jun 10 2005 Buchan Milne 1.3.0-3mdk +- Rebuild for libkrb53-devel 1.4.1 + +* Sat May 21 2005 Buchan Milne 1.3.0-2mdk +- Rebuild for new libperl.so + +* Thu May 12 2005 Pascal Terjan 1:1.3.0-1mdk +- 1.3.0 (fix CAN-2005-1261 and CAN-2005-1262) + +* Tue May 03 2005 Pascal Terjan 1:1.2.1-4mdk +- Rebuild for new silc + +* Sat Apr 23 2005 Pascal Terjan 1:1.2.1-3mdk +- Fix for gcc4 + +* Fri Apr 22 2005 Pascal Terjan 1:1.2.1-2mdk +- Rebuild for new evolution-data-server + +* Sat Apr 16 2005 Pascal Terjan 1:1.2.1-1mdk +- New release 1.2.1 + +* Mon Mar 21 2005 Pascal Terjan 1:1.1.4-3mdk +- Get a release number greater than the one from updates +- Requires on release + +* Tue Mar 01 2005 Pascal Terjan 1.1.4-2mdk +- Fix rebuilding on <= 10.0 + +* Sun Feb 27 2005 Pascal Terjan 1.1.4-1mdk +- New release 1.1.4 + +* Sat Feb 26 2005 Abel Cheung 1.1.3-2mdk +- Append QQ theme to default theme + +* Sat Feb 19 2005 Pascal Terjan 1.1.3-1mdk +- New release 1.1.3 + +* Sat Feb 19 2005 Pascal Terjan 1.1.2-2mdk +- Rebuild + +* Fri Jan 21 2005 Pascal Terjan 1.1.2-1mdk +- 1.1.2 + +* Tue Dec 28 2004 Pascal Terjan 1.1.1-1mdk +- 1.1.1 + +* Sun Dec 05 2004 Pascal Terjan 1.1.0-1mdk +- 1.1.0 + +* Mon Nov 15 2004 Pascal Terjan 1.0.3-2mdk +- rebuild for new perl + +* Fri Nov 12 2004 Pascal Terjan 1.0.3-1mdk +- New release 1.0.3 + +* Wed Oct 27 2004 Abel Cheung 1.0.2-2mdk +- Adds SILC support +- Use UTF-8 for spec file +- Remove patch1; festival plugin splitted from gaim, to simplify build +- Re-enable kerberos for zephyr +- Corrected devel package requirement +- Reorganize docs + +* Thu Oct 21 2004 Pascal Terjan 1.0.2-1mdk +- New release 1.0.2 + +* Tue Sep 14 2004 Christiaan Welvaart 0.82.1-2mdk +- add BuildRequires: libnss-devel libnspr-devel (for MSN support) + +* Mon Aug 30 2004 Pascal Terjan 0.82.1-1mdk +- 0.82.1 + +* Fri Aug 27 2004 Pascal Terjan 0.82-1mdk +- 0.82 + +* Fri Aug 27 2004 Pascal Terjan 0.81-3mdk +- security fix + +* Sat Aug 21 2004 Laurent MONTEL 0.81-2mdk +- Rebuild with new menu + +* Mon Jul 19 2004 Pascal Terjan 0.81-1mdk +- 0.81 + +* Mon Jul 19 2004 Pascal Terjan 0.80-1mdk +- 0.80 +- updated patch0 + +* Sun Jul 18 2004 Pascal Terjan 0.79-4mdk +- rebuild for new evolution data server + +* Wed Jun 30 2004 Per Øyvind Karlsen 0.79-3mdk +- fix buildrequires + +* Tue Jun 29 2004 Pascal Terjan 0.79-2mdk +- put .h for gaim in gaim-devel, not libgaimremote-devel + +* Tue Jun 29 2004 Pascal Terjan 0.79-1mdk +- 0.79 +- move gaim-encryption to a separate package +- add a -devel package +- gaim-festival 0.78 + +* Fri Jun 11 2004 Pascal Terjan 0.78-4mdk +- Rebuild for evolution-data-server + +* Fri Jun 04 2004 Pascal Terjan 0.78-3mdk +- Allow rebuilding on stable version + +* Tue Jun 01 2004 Abel Cheung 0.78-2mdk +- More epoch fixes +- Enable and split tcl plugin +- Drop source100, use ImageMagick to convert icons +- Don't remove locale, en_CA is valid! +- Update festival plugin + +* Tue Jun 01 2004 Pascal Terjan 0.78-1mdk +- gaim-encryption 2.26 +- stop removing libtoolize +- fix invalid-lc-messages-dir (en_CA) +- 0.78 + +* Sat May 01 2004 Pascal Terjan 0.77-2mdk +- gaim-encryption 2.25 to fix plugin loading due to API mismatch +- gaim festival 0.77 (Does not fix API mismatch :( ) + +* Sat Apr 24 2004 Pascal Terjan 0.77-1mdk +- 0.77 +- move gevolution plugin into a separate package + +* Sun Apr 04 2004 Pascal Terjan 0.76-1mdk +- 0.76 +- drop Patch2 + +* Wed Feb 25 2004 Pascal Terjan 0.75-5mdk +- add missing Epoch in libgaim-remote0-devel Require + +* Tue Feb 24 2004 Pascal Terjan 0.75-4mdk +- use epoch in subpackages Requires + From 89a9f20c26641334e2f14c5934fd8f4b29b796ed Mon Sep 17 00:00:00 2001 From: Alexander Khryukin Date: Mon, 19 Nov 2012 18:37:20 +0400 Subject: [PATCH 4/6] spec cleanup --- pidgin-2.10.0-gg-search-by-uin.patch | 13 +- pidgin-2.8.0-gg-disconnect.patch | 18 +- pidgin-2.8.0-reread-resolvconf.patch | 4 +- pidgin.spec | 964 +-------------------------- 4 files changed, 18 insertions(+), 981 deletions(-) diff --git a/pidgin-2.10.0-gg-search-by-uin.patch b/pidgin-2.10.0-gg-search-by-uin.patch index f779331..1fc8421 100644 --- a/pidgin-2.10.0-gg-search-by-uin.patch +++ b/pidgin-2.10.0-gg-search-by-uin.patch @@ -1,16 +1,15 @@ ---- pidgin-2.10.0/libpurple/protocols/gg/gg.c.gg-search 2011-08-18 10:51:03.000000000 +0200 -+++ pidgin-2.10.0/libpurple/protocols/gg/gg.c 2011-08-22 15:57:02.000000000 +0200 -@@ -533,6 +533,9 @@ static void ggp_callback_find_buddies(Pu +--- pidgin-2.10.0/libpurple/protocols/gg/gg.c.orig 2011-08-18 10:51:03.000000000 +0200 ++++ pidgin-2.10.0/libpurple/protocols/gg/gg.c 2011-08-21 09:54:41.000000000 +0200 +@@ -533,6 +533,8 @@ purple_request_fields_get_string(fields, "firstname")); form->nickname = g_strdup( purple_request_fields_get_string(fields, "nickname")); -+ form->uin = charset_convert( -+ purple_request_fields_get_string(fields, "uin"), -+ "UTF-8", "CP1250"); ++ form->uin = g_strdup( ++ purple_request_fields_get_string(fields, "uin")); form->city = g_strdup( purple_request_fields_get_string(fields, "city")); form->birthyear = g_strdup( -@@ -586,6 +589,11 @@ static void ggp_find_buddies(PurplePlugi +@@ -586,6 +588,11 @@ purple_request_field_string_set_masked(field, FALSE); purple_request_field_group_add_field(group, field); diff --git a/pidgin-2.8.0-gg-disconnect.patch b/pidgin-2.8.0-gg-disconnect.patch index c1b2bcd..0b06184 100644 --- a/pidgin-2.8.0-gg-disconnect.patch +++ b/pidgin-2.8.0-gg-disconnect.patch @@ -1,14 +1,14 @@ ---- pidgin-2.8.0/libpurple/protocols/gg/gg.c.orig 2011-06-08 03:10:11.000000000 +0200 -+++ pidgin-2.8.0/libpurple/protocols/gg/gg.c 2011-06-08 03:13:44.000000000 +0200 +--- pidgin-2.8.0/libpurple/protocols/gg/gg.c.orig 2011-06-08 03:10:11.000000000 +0200 ++++ pidgin-2.8.0/libpurple/protocols/gg/gg.c 2011-06-08 03:13:44.000000000 +0200 @@ -1816,6 +1816,11 @@ - case GG_EVENT_PUBDIR50_SEARCH_REPLY: - ggp_pubdir_reply_handler(gc, ev->event.pubdir50); - break; -+ case GG_EVENT_DISCONNECT: + case GG_EVENT_PUBDIR50_SEARCH_REPLY: + ggp_pubdir_reply_handler(gc, ev->event.pubdir50); + break; ++ case GG_EVENT_DISCONNECT: + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_OTHER_ERROR, + _("Server Disconnect.")); + break; - case GG_EVENT_TYPING_NOTIFICATION: - ggp_typing_notification_handler(gc, ev->event.typing_notification.uin, - ev->event.typing_notification.length); + case GG_EVENT_TYPING_NOTIFICATION: + ggp_typing_notification_handler(gc, ev->event.typing_notification.uin, + ev->event.typing_notification.length); diff --git a/pidgin-2.8.0-reread-resolvconf.patch b/pidgin-2.8.0-reread-resolvconf.patch index e7b49b5..aea28ab 100644 --- a/pidgin-2.8.0-reread-resolvconf.patch +++ b/pidgin-2.8.0-reread-resolvconf.patch @@ -1,5 +1,5 @@ ---- pidgin-2.8.0/libpurple/network.c.reread-resolvconf 2011-06-07 10:44:40.000000000 +0200 -+++ pidgin-2.8.0/libpurple/network.c 2011-06-08 03:09:18.000000000 +0200 +--- pidgin-2.8.0/libpurple/network.c.reread-resolvconf 2011-06-09 16:30:04.764927571 +0200 ++++ pidgin-2.8.0/libpurple/network.c 2011-06-09 16:31:29.356249181 +0200 @@ -874,8 +874,6 @@ #else case NM_STATE_CONNECTED: diff --git a/pidgin.spec b/pidgin.spec index 9b24bde..dea36a8 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -26,18 +26,10 @@ %define build_mono 0 %endif -%if %mdvver < 201020 -%define build_vv 0 -%endif - -%if %mdvver <= 201100 -%define build_evolution 1 -%endif - Summary: A GTK+ based multiprotocol instant messaging client Name: pidgin Version: 2.10.6 -Release: 2 +Release: 3 Group: Networking/Instant messaging License: GPLv2+ URL: http://www.pidgin.im/ @@ -86,11 +78,7 @@ BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.5 Buildrequires: pkgconfig(ncursesw) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(nspr) -%if %mdkversion >= 201100 Buildrequires: pkgconfig(python) -%else -BuildRequires: python-devel -%endif BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sm) Buildrequires: pkgconfig(sqlite3) @@ -122,13 +110,8 @@ BuildRequires: perl-devel BuildRequires: pkgconfig(mono) %endif %if %build_vv -%if %mdvver >= 201200 BuildRequires: pkgconfig(farstream-0.1) Suggests: gstreamer0.10-farstream -%else -BuildRequires: pkgconfig(farsight2-0.10) -Suggests: gstreamer0.10-farsight2 -%endif %endif Requires: %{name}-i18n = %{version}-%{release} @@ -518,948 +501,3 @@ rm -f %{buildroot}%{_libdir}/*.*a %{_datadir}/purple/ca-certs/Microsoft* %{_datadir}/purple/ca-certs/VeriSign* %{_datadir}/purple/ca-certs/DigiCert* - - - -%changelog -* Tue Jul 10 2012 Götz Waschk 2.10.6-1mdv2012.0 -+ Revision: 808702 -- add missing gcrypt build dev for gnutls (on cooker) -- readd farsight2 dep from 2011 builds -- update to new version 2.10.6 - - + Oden Eriksson - - 2.10.5 - -* Wed May 09 2012 Götz Waschk 2.10.4-1 -+ Revision: 797778 -- disable evolution support for Cooker -- update to new version 2.10.4 - -* Tue Mar 27 2012 Sergey Zhemoitel 2.10.3-1 -+ Revision: 787438 -- update to 2.10.3 - -* Fri Mar 16 2012 Per Øyvind Karlsen 2.10.2-2 -+ Revision: 785409 -- explicitly add soname to liboscar.so & libjabber.so, since we link other - plugins against them, fixing dependencies generated (P118) - -* Wed Mar 14 2012 Sergey Zhemoitel 2.10.2-1 -+ Revision: 785022 -- release up to 2.10.2 - -* Tue Dec 13 2011 Per Øyvind Karlsen 2.10.1-2 -+ Revision: 740742 -- fix perl module build (P117) - -* Mon Dec 12 2011 Matthew Dawkins 2.10.1-1 -+ Revision: 740482 -- last fix for requires -- pidgin & finch req client not the otherway around -- added build_perl for broken perl build -- fixed BRs -- major spec clean up -- split out purple-client lib -- cleans up requires for devel pkg -- converted BRs to pkgconfig provides -- enabled NM build, NM is now in main -- removed pre200900 Obsoletes/Provides -- renamed libfinch0 to proper lib name libgnt0 -- removed dup requires for lib pkgs -- removed is this Cooker - - + Oden Eriksson - - 2.10.1 - - various fixes - -* Tue Sep 06 2011 Oden Eriksson 2.10.0-3 -+ Revision: 698448 -- make it backportable again - -* Mon Aug 22 2011 Götz Waschk 2.10.0-2 -+ Revision: 696147 -- update patch 115 and reenable patches - - + Sergey Zhemoitel - - off all patchs - - new release 2.10.0 - -* Mon Jun 27 2011 Sergey Zhemoitel 2.9.0-2 -+ Revision: 687464 -- import source new version -- new version 2.9.0 - - + Götz Waschk - - spec cleanup - -* Thu Jun 09 2011 Götz Waschk 2.8.0-2 -+ Revision: 683415 -- build against internal libgadu - -* Wed Jun 08 2011 Funda Wang 2.8.0-1 -+ Revision: 683216 -- update file list -- ther e is no qq protocol -- cleanup spec -- New version 2.8.0 -- rediff resolveconf and gg-disconnect patch -- remove fetion protocol, will be replaced by pidgin-ofetion - -* Sun May 22 2011 Funda Wang 2.7.11-3 -+ Revision: 677214 -- rebuild - -* Thu May 05 2011 Funda Wang 2.7.11-2 -+ Revision: 669200 -- br gconf2 - - + Oden Eriksson - - mass rebuild - -* Fri Mar 11 2011 Götz Waschk 2.7.11-1 -+ Revision: 643789 -- update to new version 2.7.11 - -* Mon Feb 07 2011 Funda Wang 2.7.10-1 -+ Revision: 636555 -- update to new version 2.7.10 - -* Mon Dec 27 2010 Funda Wang 2.7.9-1mdv2011.0 -+ Revision: 625375 -- update to new version 2.7.9 - -* Wed Dec 22 2010 Funda Wang 2.7.8-1mdv2011.0 -+ Revision: 623830 -- update BR -- new version 2.7.8 - -* Mon Nov 29 2010 Tomasz Pawel Gajc 2.7.7-2mdv2011.0 -+ Revision: 603141 -- rebuild for new libgadu - -* Wed Nov 24 2010 Götz Waschk 2.7.7-1mdv2011.0 -+ Revision: 600377 -- update to new version 2.7.7 - -* Mon Nov 22 2010 Götz Waschk 2.7.6-2mdv2011.0 -+ Revision: 599830 -- rebuild -- update to new version 2.7.6 - -* Wed Nov 03 2010 Götz Waschk 2.7.5-3mdv2011.0 -+ Revision: 592788 -- rebuild again :-( -- rebuild for missing source package - - + Funda Wang - - new snapshot of fetion plugin - - new version 2.7.5 - -* Mon Nov 01 2010 Funda Wang 2.7.4-2mdv2011.0 -+ Revision: 591300 -- rebuild for py 2.7 - -* Thu Oct 21 2010 Oden Eriksson 2.7.4-1mdv2011.0 -+ Revision: 587096 -- 2.7.4 -- drop one upstream added patch -- drop 2008.0 stuff - -* Wed Aug 11 2010 Funda Wang 2.7.3-1mdv2011.0 -+ Revision: 568947 -- new version 2.7.3 -- New version 2.7.2 - -* Tue Jun 22 2010 Götz Waschk 2.7.1-1mdv2010.1 -+ Revision: 548500 -- new version -- disable mono plugin as discussed with the pidgin devs -- rediff patches 0,2 -- drop patches 4,5,100,102,118,120 -- bump gtk+ dep -- build finch with python support - - + Oden Eriksson - - added 2008.0 conditionals - -* Mon May 17 2010 Götz Waschk 2.6.6-5mdv2010.1 -+ Revision: 544964 -- fix build of the mono plugin -- add security patch for msn (CVE-2010-1624) - -* Mon Apr 12 2010 Götz Waschk 2.6.6-4mdv2010.1 -+ Revision: 533672 -- add perl plugin patch (bug #58439) - -* Thu Mar 25 2010 Oden Eriksson 2.6.6-3mdv2010.1 -+ Revision: 527400 -- rebuilt against nss-3.12.6 - -* Mon Mar 15 2010 Götz Waschk 2.6.6-2mdv2010.1 -+ Revision: 519817 -- add patches for AIM/ICQ client login - -* Thu Feb 18 2010 Oden Eriksson 2.6.6-1mdv2010.1 -+ Revision: 507410 -- 2.6.6 -- rediffed P3 but added -avoid-version too - - + Pascal Terjan - - Do not list evolution package when not built - -* Mon Jan 11 2010 Funda Wang 2.6.5-1mdv2010.1 -+ Revision: 489460 -- New version 2.6.5 - -* Sat Jan 02 2010 Götz Waschk 2.6.4-3mdv2010.1 -+ Revision: 485012 -- don't build evolution plugin on Cooker -- prepare for backports - - + Olivier Blin - - bump release - - default to xdg-open to open links (instead of inexistent mozilla) - -* Mon Nov 30 2009 Götz Waschk 2.6.4-1mdv2010.1 -+ Revision: 472064 -- add MXit plugin -- new version -- drop patches 101, 102, 103 -- rediff patch 2 - -* Sun Oct 25 2009 Götz Waschk 2.6.3-2mdv2010.0 -+ Revision: 459197 -- fix tray icon size in KDE (bug #54667) - -* Fri Oct 16 2009 Oden Eriksson 2.6.3-1mdv2010.0 -+ Revision: 457896 -- dropped P100, applied upstream -- rediffed some patches -- 2.6.3 - -* Sat Oct 10 2009 Tomasz Pawel Gajc 2.6.2-4mdv2010.0 -+ Revision: 456482 -- reenable gadu-gadu support, because latest libgadu trunk is fixed - -* Fri Oct 09 2009 Funda Wang 2.6.2-3mdv2010.0 -+ Revision: 456371 -- new snapshot of fetion plugin - -* Fri Oct 09 2009 Götz Waschk 2.6.2-2mdv2010.0 -+ Revision: 456260 -- disable libgadu build on Cooker, libgadu 1.9.0 is too new -- backport some fixes from Monotone and Fedora - * Yahoo status change - * Yahoo buddy idle time - * Jabber crash when validating JID - * AIM grab buddy status -- really disable vv for backports - -* Mon Sep 07 2009 Götz Waschk 2.6.2-1mdv2010.0 -+ Revision: 432615 -- new version -- update file list - -* Wed Aug 19 2009 Götz Waschk 2.6.1-1mdv2010.0 -+ Revision: 418043 -- new version - -* Wed Aug 19 2009 Götz Waschk 2.6.0-1mdv2010.0 -+ Revision: 417964 -- new version -- rediff patches 2,111,118 -- drop patches 5,120 -- update build deps -- update file list - -* Tue Aug 18 2009 Frederik Himpe 2.5.9-1mdv2010.0 -+ Revision: 417853 -- update to new version 2.5.9 - -* Sun Aug 09 2009 Funda Wang 2.5.8-2mdv2010.0 -+ Revision: 411852 -- new snapshot of fetion plugin - -* Mon Jun 29 2009 Oden Eriksson 2.5.8-1mdv2010.0 -+ Revision: 390445 -- bump release -- 2.5.8 -- prepare for main/testing - -* Sun Jun 21 2009 Oden Eriksson 2.5.7-1mdv2010.0 -+ Revision: 387569 -- 2.5.7 -- drop one upstream implemented patch (P121) - -* Thu Jun 18 2009 Funda Wang 2.5.6-3mdv2010.0 -+ Revision: 386941 -- New version of fetion plugin - -* Fri Jun 05 2009 Götz Waschk 2.5.6-2mdv2010.0 -+ Revision: 382982 -- fix MSN contact addition - -* Thu May 21 2009 Götz Waschk 2.5.6-1mdv2010.0 -+ Revision: 378486 -- fix installation -- new version -- drop patches 6,7 - -* Thu May 07 2009 Götz Waschk 2.5.5-6mdv2010.0 -+ Revision: 372835 -- fix crash with new mail notification (bug #49124) -- drop old configure option - -* Thu Apr 23 2009 Funda Wang 2.5.5-5mdv2009.1 -+ Revision: 368796 -- New fetion snapshot to fix crash when login - -* Thu Apr 02 2009 Götz Waschk 2.5.5-4mdv2009.1 -+ Revision: 363556 -- fix crash in msn plugin (bug #49160) - -* Sat Mar 21 2009 Funda Wang 2.5.5-3mdv2009.1 -+ Revision: 359921 -- new source of fetion plugin - - + Götz Waschk - - rebuild for bug #48621 - -* Wed Mar 04 2009 Götz Waschk 2.5.5-1mdv2009.1 -+ Revision: 348200 -- drop patch 4 -- new version -- update file list - -* Mon Mar 02 2009 Götz Waschk 2.5.4-2mdv2009.1 -+ Revision: 347095 -- add one time password plugin - -* Tue Jan 13 2009 Götz Waschk 2.5.4-1mdv2009.1 -+ Revision: 328879 -- spec fix -- update to new version 2.5.4 - -* Sun Jan 11 2009 Funda Wang 2.5.3-2mdv2009.1 -+ Revision: 328305 -- rebuild for new silc-toolkit - -* Sun Dec 21 2008 Götz Waschk 2.5.3-1mdv2009.1 -+ Revision: 317116 -- new version -- rediff patches 0,2,111,119 -- drop patch 117 -- patches 1,5: fix format strings -- update file list - -* Sat Dec 06 2008 Adam Williamson 2.5.2-3mdv2009.1 -+ Revision: 311098 -- buildrequires dbus-glib-devel -- rebuild for new tcl - -* Fri Oct 24 2008 Pascal Terjan 2.5.2-2mdv2009.1 -+ Revision: 296924 -- Add a ugly patch to have the window appear when clicking on the tray icon - -* Mon Oct 20 2008 Götz Waschk 2.5.2-1mdv2009.1 -+ Revision: 295546 -- new version -- drop patches 100-103 - -* Mon Oct 13 2008 Götz Waschk 2.5.1-5mdv2009.1 -+ Revision: 293134 -- add several crash fixes from Fedora - -* Wed Oct 01 2008 Frederic Crozat 2.5.1-4mdv2009.0 -+ Revision: 290324 -- Fix conflicts for 2008.1 upgrade - -* Mon Sep 29 2008 Funda Wang 2.5.1-3mdv2009.0 -+ Revision: 289226 -- New snapshot of fetion support - -* Fri Sep 05 2008 Pascal Terjan 2.5.1-2mdv2009.0 -+ Revision: 281213 -- Add a simple patch to avoid a crash (reported upstream as #6972) - - + Götz Waschk - - fix build deps - - fix dep of the devel package - -* Mon Sep 01 2008 Götz Waschk 2.5.1-1mdv2009.0 -+ Revision: 278103 -- new version - -* Wed Aug 20 2008 Götz Waschk 2.5.0-2mdv2009.0 -+ Revision: 274372 -- switch to rootcerts - -* Wed Aug 20 2008 Götz Waschk 2.5.0-1mdv2009.0 -+ Revision: 274213 -- new version -- drop patches 1,113 - -* Fri Aug 08 2008 Tomasz Pawel Gajc 2.4.3-5mdv2009.0 -+ Revision: 268321 -- Patch117: new version(this patch should be included upstream into next pidgin release), of the GG picture sender - -* Tue Jul 22 2008 Funda Wang 2.4.3-4mdv2009.0 -+ Revision: 240009 -- New fetion snapshot - -* Tue Jul 22 2008 Funda Wang 2.4.3-3mdv2009.0 -+ Revision: 240005 -- disable mono plugin in mips arch - -* Wed Jul 16 2008 Götz Waschk 2.4.3-2mdv2009.0 -+ Revision: 236381 -- rebuild - -* Wed Jul 02 2008 Götz Waschk 2.4.3-1mdv2009.0 -+ Revision: 230612 -- new version -- temporarily disable patch 4 -- drpo patch 118 - -* Wed Jul 02 2008 Pascal Terjan 2.4.2-12mdv2009.0 -+ Revision: 230582 -- Add upstream patch to fix connecting to ICQ - -* Fri Jun 27 2008 Funda Wang 2.4.2-11mdv2009.0 -+ Revision: 229385 -- New snapshot of fetion plugin, fix memory leak - - + Tomasz Pawel Gajc - - own missing directories - -* Sun Jun 15 2008 Tomasz Pawel Gajc 2.4.2-9mdv2009.0 -+ Revision: 219309 -- Patch117: new version of patch - - + Pixel - - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Sun Jun 08 2008 Funda Wang 2.4.2-8mdv2009.0 -+ Revision: 216780 -- disable msnp14 as it is too broken - - + Tomasz Pawel Gajc - - Patch113: new version - - Patch117: new version - - clean up buildrequires, descriptions and file list - -* Sat Jun 07 2008 Tomasz Pawel Gajc 2.4.2-6mdv2009.0 -+ Revision: 216736 -- Patch117: add initial support for sending images for Gadu-Gadu (upstream bug #220, thanks goes to Tomasz S. - -* Sun Jun 01 2008 Funda Wang 2.4.2-5mdv2009.0 -+ Revision: 214118 -- add a patch to solve null name for qq group - -* Thu May 29 2008 Funda Wang 2.4.2-4mdv2009.0 -+ Revision: 213076 -- build jabber and oscar plugin as module -- try build with msnp14 - -* Mon May 19 2008 Tomasz Pawel Gajc 2.4.2-3mdv2009.0 -+ Revision: 208977 -- remove dumb re-defineies -- remove old switches for really old mdv releases -- add missing buildrequires -- enable SILC support -- do not package COPYING files, fix all the docs -- disable networkmanager as mdv doesn't make any use of it - -* Mon May 19 2008 Funda Wang 2.4.2-2mdv2009.0 -+ Revision: 208866 -- do not build networkmanager -- should BR nm-utils -- only enable nm support on 2009.0 - -* Sun May 18 2008 Funda Wang 2.4.2-1mdv2009.0 -+ Revision: 208575 -- explicitly enabled evo and cap plugin -- disable evolution build -- fix file list -- BR networkmanager -- New version 2.4.2 - -* Mon Apr 28 2008 Funda Wang 2.4.1-4mdv2009.0 -+ Revision: 198017 -- add fetion protocol into file list -- addd fetion support -- add patch for new autoconf (from PLD Linux) - - + Götz Waschk - - improve deps for backports - -* Wed Apr 16 2008 Tomasz Pawel Gajc 2.4.1-3mdv2009.0 -+ Revision: 194810 -- drop patch 112 as it was merged upstream -- Patch113: new version - -* Wed Apr 09 2008 Götz Waschk 2.4.1-2mdv2009.0 -+ Revision: 192440 -- split out purple plugins to pidgin-plugins - -* Wed Apr 02 2008 Götz Waschk 2.4.1-1mdv2008.1 -+ Revision: 191565 -- new version - -* Thu Mar 06 2008 Götz Waschk 2.4.0-2mdv2008.1 -+ Revision: 180317 -- remove facebook plugin - -* Sat Mar 01 2008 Götz Waschk 2.4.0-1mdv2008.1 -+ Revision: 177360 -- new version -- drop patch 2 -- update buildrequires - -* Wed Feb 27 2008 Tomasz Pawel Gajc 2.3.1-4mdv2008.1 -+ Revision: 175953 -- Patch116: handle gg server disconnection - -* Mon Feb 18 2008 Götz Waschk 2.3.1-3mdv2008.1 -+ Revision: 170105 -- drop unapplied patches 1,114 -- patch to fix bug #35905 (broken accounts.xml) - - + Thierry Vignaud - - fix gstreamer0.10-devel BR for x86_64 - -* Tue Jan 15 2008 Tomasz Pawel Gajc 2.3.1-2mdv2008.1 -+ Revision: 152757 -- seaching people by uin on Gadu-Gadu network is broken, fixing this with patch 115 - - + Olivier Blin - - restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - -* Sat Dec 08 2007 Funda Wang 2.3.1-1mdv2008.1 -+ Revision: 116404 -- New version 2.3.1 - -* Wed Nov 28 2007 Tomasz Pawel Gajc 2.3.0-1mdv2008.1 -+ Revision: 113537 -- disable patch 114 -- set explicit version for libgadu-devel (no SSL support) -- update patches 112 and 113, which are required by pidgin-privacy-please -- new version - -* Thu Oct 25 2007 Götz Waschk 2.2.2-1mdv2008.1 -+ Revision: 102021 -- new version - -* Fri Oct 12 2007 Pascal Terjan 2.2.1-2mdv2008.1 -+ Revision: 97243 -- Don't crash on Jabber connection refused in non UTF-8 locale (upstream #2247) - -* Wed Oct 03 2007 Götz Waschk 2.2.1-1mdv2008.0 -+ Revision: 94925 -- new version -- update patch 112 -- drop patches 114-117 - - + Tomasz Pawel Gajc - - new license policy - - correct url for source0 - - remove mixture of tabs and space - - add upstream patches 114-117 (memleaks, proxy settings etc.) - - rediff patch 111 - - do not obsolete devel library - - enable gnutls - - add scriplets - - fix file list - - new version - -* Fri Sep 07 2007 Anssi Hannula 2.1.1-4mdv2008.0 -+ Revision: 82025 -- rebuild for new soname of tcl - -* Fri Aug 31 2007 Funda Wang 2.1.1-3mdv2008.0 -+ Revision: 76499 -- Synch pp patches with upstream version - -* Wed Aug 22 2007 Götz Waschk 2.1.1-2mdv2008.0 -+ Revision: 68887 -- rediff patch 112 (Maarten Vanraes) -- reenable patch 113 - -* Tue Aug 21 2007 Funda Wang 2.1.1-1mdv2008.0 -+ Revision: 68173 -- New version 2.1.1 -- rediff patch0 -- disable privacy patch as it does not apply now - -* Sun Aug 12 2007 Funda Wang 2.1.0-2mdv2008.0 -+ Revision: 62317 -- fix upgrade - -* Mon Jul 30 2007 Funda Wang 2.1.0-1mdv2008.0 -+ Revision: 56708 -- New version 2.1.0 - -* Thu Jul 26 2007 David Walluck 2.0.2-4mdv2008.0 -+ Revision: 56092 -- add patch for panel icon size - -* Mon Jul 23 2007 Funda Wang 2.0.2-3mdv2008.0 -+ Revision: 54660 -- introduce i18n package to reduce dependency of finch -- rebuild against new silc-toolkit - -* Fri Jun 29 2007 Andreas Hasenack 2.0.2-2mdv2008.0 -+ Revision: 45603 -- rebuild with new rpm-mandriva-setup (-fstack-protector) - - + Funda Wang - - Add obsoletes - - New devel policy. - -* Fri Jun 15 2007 Funda Wang 2.0.2-1mdv2008.0 -+ Revision: 40038 -- add missing file -- patch1 not needed -- New version - -* Thu Jun 14 2007 Tomasz Pawel Gajc 2.0.1-5mdv2008.0 -+ Revision: 39477 -- really build against libgadu - -* Sat Jun 09 2007 Tomasz Pawel Gajc 2.0.1-4mdv2008.0 -+ Revision: 37630 -- don't use pidgin's own libgadu, which is quite old (use one from main repository) -- disable building of static files rather than deleting them -- use some dirty hack for parallel build - -* Fri Jun 08 2007 Colin Guthrie 2.0.1-3mdv2008.0 -+ Revision: 37053 -- Add support for the Facebook plugin (early in development) -- Patch to work with new Evolution Data Server -- Fix a crash relating to MSN Buddy authorization. Thanks to Stefan Ott. - -* Thu May 31 2007 Tomasz Pawel Gajc 2.0.1-2mdv2008.0 -+ Revision: 33203 -- patches 112 and 133 enable use of pidgin-privacy-please module - -* Sat May 26 2007 Funda Wang 2.0.1-1mdv2008.0 -+ Revision: 31329 -- New upstream version 2.0.1 - -* Fri May 04 2007 Funda Wang 2.0.0-1mdv2008.0 -+ Revision: 22394 -- new upstream version 2.0.0 - - + Götz Waschk - - sync with fedora: drop patches 102,103 - -* Wed May 02 2007 Götz Waschk 2.0.0-0.beta7.1mdv2008.0 -+ Revision: 20573 -- fix spec an file list -- drop epoch tag -- drop source 2 (QQ smiley theme) -- drop merged patch 1 -- update patch 0 -- rediff patch 103 - - + Funda Wang - - evolution plugin should be in pidgin area. - - split finch into individual package. - - merge libgaim0 into pidgin main package. - - make it more clear to distinguish library and app, - by naming pidgin and purple. - - try gaim->pidgin convertion. - - new upstream version beta7 - - gaim now names pidgin - - gaim now names pidgin - - -* Thu Feb 01 2007 Götz Waschk 2.0.0-2.beta6.2mdv2007.0 -+ Revision: 115818 -- fix mono example plugins and reenable mono support -- fix deps between the subpackages, as long as it is a prerelease - -* Fri Jan 19 2007 Götz Waschk 1:2.0.0-2.beta6.1mdv2007.1 -+ Revision: 110627 -- new version -- disable mono, it currently does not build -- drop patches 104, 105, 106, 107, 108, 110, 112, 150, 152, 153 -- add new plugins - -* Wed Jan 10 2007 Götz Waschk 1:2.0.0-2.beta5.6mdv2007.1 -+ Revision: 107128 -- port a few bug fixes from Fedora - -* Fri Dec 01 2006 Pascal Terjan 1:2.0.0-2.beta5.5mdv2007.1 -+ Revision: 89504 -- Drop the threads patch, it is now initialized correctly, and initializing it twice now aborts - -* Wed Nov 29 2006 Götz Waschk 1:2.0.0-2.beta5.4mdv2007.1 -+ Revision: 88289 -- bot rebuild -- fix buildrequires -- rebuild - -* Sat Nov 11 2006 Götz Waschk 1:2.0.0-2.beta5.1mdv2007.0 -+ Revision: 81050 -- new version -- readd source signature -- update file list - -* Sat Oct 21 2006 Götz Waschk 1:2.0.0-2.beta4.2mdv2007.1 -+ Revision: 71560 -- readd dbus thread fix - -* Fri Oct 20 2006 Götz Waschk 1:2.0.0-2.beta4.1mdv2007.1 -+ Revision: 71292 -- Import gaim - -* Fri Oct 20 2006 Götz Waschk 2.0.0-2.beta4.1mdv2007.1 -- fix buildrequires -- drop patch 1 -- unpack patch -- new version - -* Wed Aug 23 2006 Pascal Terjan 1:2.0.0-2.beta3.1.1mdv2007.0 -- Beta 3.1... - -* Tue Aug 15 2006 Götz Waschk 2.0.0-1.beta3.12mdv2007.0 -- fix buildrequires - -* Sun Aug 13 2006 Pascal Terjan 1:2.0.0-1.beta3.11mdv2007.0 -- Initialize threads as gnomevfs now uses dbus (P1) - -* Thu Aug 03 2006 Frederic Crozat 1:2.0.0-1.beta3.9mdv2007.0 -- Rebuild with latest dbus - -* Wed Jul 26 2006 Götz Waschk 2.0.0-1.beta3.8mdv2007.0 -- rebuild for new e-d-s - -* Sun Jul 16 2006 Nicolas Lécureuil 1:2.0.0-0.beta3.7mdv2007.0 -- XDG menu - -* Tue May 02 2006 Götz Waschk 2.0.0-0.beta3.6mdk -- rebuild - -* Wed Apr 19 2006 Götz Waschk 2.0.0-0.beta3.5mdk -- build the mono package - -* Fri Apr 14 2006 Götz Waschk 2.0.0-0.beta3.4mdk -- add mono package - -* Thu Apr 13 2006 Götz Waschk 2.0.0-0.beta3.3mdk -- rebuild for new e-d-s - -* Fri Mar 31 2006 Götz Waschk 2.0.0-0.beta3.2mdk -- fix buildrequires - -* Thu Mar 30 2006 Götz Waschk 2.0.0-0.beta3.1mdk -- drop patch 1 -- new version - -* Tue Feb 14 2006 Götz Waschk 2.0.0-0.beta2.3mdk -- patch for new libortp, but disable vv - -* Wed Jan 25 2006 Götz Waschk 2.0.0-0.beta2.2mdk -- rebuild for new dbus - -* Tue Jan 24 2006 Götz Waschk 2.0.0-0.beta2.1mdk -- update patch 0 -- fix buildrequires -- new version - -* Mon Jan 02 2006 Pascal Terjan 1:2.0.0-0.beta1.5mdk -- fix dbus-example.so belonging to 2 subpackages - -* Sun Jan 01 2006 Oden Eriksson 1:2.0.0-0.beta1.4mdk -- rebuilt against soname aware deps (tcl/tk) -- fix deps - -* Sat Dec 24 2005 Pascal Terjan 1:2.0.0-0.beta1.3mdk -- fix missing %% -- don't build dbus and meanwhile on <= 2006.0 -- BuildRequires doxygen for documentation (thanx misc for the reports) - -* Thu Dec 22 2005 Pascal Terjan 1:2.0.0-0.beta1.2mdk -- Change libgaimremote to libgaim-client -- Buildconflicts with stuff we can't disable in configure - -* Sun Dec 18 2005 Pascal Terjan 1:2.0.0-0.beta1.1mdk -- 2.0.0 beta 1 -- Drop patch1 -- Drop patch2 (nas support no longer exists) -- Add Bonjour subpackage -- meanwhile is now included - -* Sun Oct 09 2005 Pascal Terjan 1:1.5.0-5mdk -- Rebuild for new evolution-data-server - -* Fri Sep 02 2005 Christiaan Welvaart 1.5.0-4mdk -- add BuildRequires: gettext-devel - -* Thu Sep 01 2005 Gwenole Beauchesne 1.5.0-3mdk -- fix build with nas support - -* Sat Aug 13 2005 Buchan Milne 1.5.0-2mdk -- use %%mkrel - -* Sat Aug 13 2005 Pascal Terjan 1:1.5.0-1mdk -- 1.5.0 - -* Sat Jul 09 2005 Pascal Terjan 1:1.4.0-1mdk -- 1.4.0 - -* Tue Jul 05 2005 Pascal Terjan 1:1.3.1-3mdk -- Don't duplicate libsilcgaim.so in main package and -silc - -* Sat Jun 18 2005 Andreas Hasenack 1:1.3.1-2mdk -- rebuilt without krb4 support - -* Sun Jun 12 2005 Pascal Terjan 1:1.3.1-1mdk -- 1.3.1 - -* Fri Jun 10 2005 Buchan Milne 1.3.0-3mdk -- Rebuild for libkrb53-devel 1.4.1 - -* Sat May 21 2005 Buchan Milne 1.3.0-2mdk -- Rebuild for new libperl.so - -* Thu May 12 2005 Pascal Terjan 1:1.3.0-1mdk -- 1.3.0 (fix CAN-2005-1261 and CAN-2005-1262) - -* Tue May 03 2005 Pascal Terjan 1:1.2.1-4mdk -- Rebuild for new silc - -* Sat Apr 23 2005 Pascal Terjan 1:1.2.1-3mdk -- Fix for gcc4 - -* Fri Apr 22 2005 Pascal Terjan 1:1.2.1-2mdk -- Rebuild for new evolution-data-server - -* Sat Apr 16 2005 Pascal Terjan 1:1.2.1-1mdk -- New release 1.2.1 - -* Mon Mar 21 2005 Pascal Terjan 1:1.1.4-3mdk -- Get a release number greater than the one from updates -- Requires on release - -* Tue Mar 01 2005 Pascal Terjan 1.1.4-2mdk -- Fix rebuilding on <= 10.0 - -* Sun Feb 27 2005 Pascal Terjan 1.1.4-1mdk -- New release 1.1.4 - -* Sat Feb 26 2005 Abel Cheung 1.1.3-2mdk -- Append QQ theme to default theme - -* Sat Feb 19 2005 Pascal Terjan 1.1.3-1mdk -- New release 1.1.3 - -* Sat Feb 19 2005 Pascal Terjan 1.1.2-2mdk -- Rebuild - -* Fri Jan 21 2005 Pascal Terjan 1.1.2-1mdk -- 1.1.2 - -* Tue Dec 28 2004 Pascal Terjan 1.1.1-1mdk -- 1.1.1 - -* Sun Dec 05 2004 Pascal Terjan 1.1.0-1mdk -- 1.1.0 - -* Mon Nov 15 2004 Pascal Terjan 1.0.3-2mdk -- rebuild for new perl - -* Fri Nov 12 2004 Pascal Terjan 1.0.3-1mdk -- New release 1.0.3 - -* Wed Oct 27 2004 Abel Cheung 1.0.2-2mdk -- Adds SILC support -- Use UTF-8 for spec file -- Remove patch1; festival plugin splitted from gaim, to simplify build -- Re-enable kerberos for zephyr -- Corrected devel package requirement -- Reorganize docs - -* Thu Oct 21 2004 Pascal Terjan 1.0.2-1mdk -- New release 1.0.2 - -* Tue Sep 14 2004 Christiaan Welvaart 0.82.1-2mdk -- add BuildRequires: libnss-devel libnspr-devel (for MSN support) - -* Mon Aug 30 2004 Pascal Terjan 0.82.1-1mdk -- 0.82.1 - -* Fri Aug 27 2004 Pascal Terjan 0.82-1mdk -- 0.82 - -* Fri Aug 27 2004 Pascal Terjan 0.81-3mdk -- security fix - -* Sat Aug 21 2004 Laurent MONTEL 0.81-2mdk -- Rebuild with new menu - -* Mon Jul 19 2004 Pascal Terjan 0.81-1mdk -- 0.81 - -* Mon Jul 19 2004 Pascal Terjan 0.80-1mdk -- 0.80 -- updated patch0 - -* Sun Jul 18 2004 Pascal Terjan 0.79-4mdk -- rebuild for new evolution data server - -* Wed Jun 30 2004 Per Øyvind Karlsen 0.79-3mdk -- fix buildrequires - -* Tue Jun 29 2004 Pascal Terjan 0.79-2mdk -- put .h for gaim in gaim-devel, not libgaimremote-devel - -* Tue Jun 29 2004 Pascal Terjan 0.79-1mdk -- 0.79 -- move gaim-encryption to a separate package -- add a -devel package -- gaim-festival 0.78 - -* Fri Jun 11 2004 Pascal Terjan 0.78-4mdk -- Rebuild for evolution-data-server - -* Fri Jun 04 2004 Pascal Terjan 0.78-3mdk -- Allow rebuilding on stable version - -* Tue Jun 01 2004 Abel Cheung 0.78-2mdk -- More epoch fixes -- Enable and split tcl plugin -- Drop source100, use ImageMagick to convert icons -- Don't remove locale, en_CA is valid! -- Update festival plugin - -* Tue Jun 01 2004 Pascal Terjan 0.78-1mdk -- gaim-encryption 2.26 -- stop removing libtoolize -- fix invalid-lc-messages-dir (en_CA) -- 0.78 - -* Sat May 01 2004 Pascal Terjan 0.77-2mdk -- gaim-encryption 2.25 to fix plugin loading due to API mismatch -- gaim festival 0.77 (Does not fix API mismatch :( ) - -* Sat Apr 24 2004 Pascal Terjan 0.77-1mdk -- 0.77 -- move gevolution plugin into a separate package - -* Sun Apr 04 2004 Pascal Terjan 0.76-1mdk -- 0.76 -- drop Patch2 - -* Wed Feb 25 2004 Pascal Terjan 0.75-5mdk -- add missing Epoch in libgaim-remote0-devel Require - -* Tue Feb 24 2004 Pascal Terjan 0.75-4mdk -- use epoch in subpackages Requires - From 6139c90c47f56f3ad63ab999c39f0209f380c436 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Feb 2013 16:45:35 +0400 Subject: [PATCH 5/6] update to 2.10.7 --- .abf.yml | 4 +++- pidgin.spec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index 3099f53..51f689a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,4 @@ +removed_sources: + pidgin-2.10.6.tar.bz2: a0532e7ba2acd205d6a5a4e3624156a980fe3d43 sources: - "pidgin-2.10.6.tar.bz2": a0532e7ba2acd205d6a5a4e3624156a980fe3d43 + pidgin-2.10.7.tar.bz2: 01bc06e3a5712dded3ad4a4913ada12a3cd01e15 diff --git a/pidgin.spec b/pidgin.spec index dea36a8..b4f517c 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -28,8 +28,8 @@ Summary: A GTK+ based multiprotocol instant messaging client Name: pidgin -Version: 2.10.6 -Release: 3 +Version: 2.10.7 +Release: 1 Group: Networking/Instant messaging License: GPLv2+ URL: http://www.pidgin.im/ From ce6ce4b2f9ae800f83cf581cf0b068371454e6e6 Mon Sep 17 00:00:00 2001 From: Alex Burmashev Date: Thu, 14 Feb 2013 16:59:41 +0400 Subject: [PATCH 6/6] removed README.MTN --- pidgin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pidgin.spec b/pidgin.spec index b4f517c..b75ca3f 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -353,7 +353,7 @@ rm -f %{buildroot}%{_libdir}/*.*a %files %doc AUTHORS COPYRIGHT ChangeLog -%doc NEWS README README.MTN doc/the_penguin.txt +%doc NEWS README doc/the_penguin.txt %{_mandir}/man1/pidgin.* %{_sysconfdir}/gconf/schemas/purple.schemas %{_bindir}/%{name}