diff --git a/includes.patch b/includes.patch deleted file mode 100644 index 9d2796f..0000000 --- a/includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pidgin-2.6.3/pidgin/plugins/gevolution/gevolution.c -=================================================================== ---- pidgin-2.6.3.orig/pidgin/plugins/gevolution/gevolution.c -+++ pidgin-2.6.3/pidgin/plugins/gevolution/gevolution.c -@@ -38,6 +38,8 @@ - - #include - -+/* #include */ -+#include - #include - /* TODO: bonobo is going away eventually, we'll need to find an alternative */ - #include diff --git a/pidgin-2.6.6.tar.bz2 b/pidgin-2.6.6.tar.bz2 deleted file mode 100644 index 62faa8d..0000000 --- a/pidgin-2.6.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9 -size 9479337 diff --git a/pidgin-2.7.3.tar.bz2 b/pidgin-2.7.3.tar.bz2 new file mode 100644 index 0000000..10c5e1d --- /dev/null +++ b/pidgin-2.7.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2 +size 9746117 diff --git a/pidgin-bnc550170-qq-2008only.patch b/pidgin-bnc550170-qq-2008only.patch deleted file mode 100644 index 08298d1..0000000 --- a/pidgin-bnc550170-qq-2008only.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: libpurple/protocols/qq/qq.c -=================================================================== ---- libpurple/protocols/qq/qq.c.orig -+++ libpurple/protocols/qq/qq.c -@@ -160,17 +160,8 @@ static void qq_login(PurpleAccount *acco - purple_debug_info("QQ", "Server list has %d\n", g_list_length(qd->servers)); - - version_str = purple_account_get_string(account, "client_version", NULL); -- qd->client_tag = QQ_CLIENT_0D55; /* set default as QQ2005 */ -- qd->client_version = 2005; -- if (version_str != NULL && strlen(version_str) != 0) { -- if (strcmp(version_str, "qq2007") == 0) { -- qd->client_tag = QQ_CLIENT_111D; -- qd->client_version = 2007; -- } else if (strcmp(version_str, "qq2008") == 0) { -- qd->client_tag = QQ_CLIENT_115B; -- qd->client_version = 2008; -- } -- } -+ qd->client_tag = QQ_CLIENT_115B; /* set default as QQ2008, no alternatives possible any more */ -+ qd->client_version = 2008; - - qd->is_show_notice = purple_account_get_bool(account, "show_notice", TRUE); - qd->is_show_news = purple_account_get_bool(account, "show_news", TRUE); -@@ -1115,16 +1106,6 @@ static void init_plugin(PurplePlugin *pl - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - - kvp = g_new0(PurpleKeyValuePair, 1); -- kvp->key = g_strdup(_("QQ2005")); -- kvp->value = g_strdup("qq2005"); -- version_kv_list = g_list_append(version_kv_list, kvp); -- -- kvp = g_new0(PurpleKeyValuePair, 1); -- kvp->key = g_strdup(_("QQ2007")); -- kvp->value = g_strdup("qq2007"); -- version_kv_list = g_list_append(version_kv_list, kvp); -- -- kvp = g_new0(PurpleKeyValuePair, 1); - kvp->key = g_strdup(_("QQ2008")); - kvp->value = g_strdup("qq2008"); - version_kv_list = g_list_append(version_kv_list, kvp); diff --git a/pidgin-directconn-argfix.patch b/pidgin-directconn-argfix.patch deleted file mode 100644 index cab3a59..0000000 --- a/pidgin-directconn-argfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c -index e4f3d5d..93a978a 100644 ---- a/libpurple/protocols/msn/directconn.c -+++ b/libpurple/protocols/msn/directconn.c -@@ -27,6 +27,7 @@ - #include "slp.h" - #include "slpmsg.h" - -+#include - /************************************************************************** - * Directconn Specific - **************************************************************************/ -@@ -413,7 +414,8 @@ directconn_connect_cb(gpointer data, gint source, const gchar *error_message) - if (error_message) - purple_debug_error("msn", "Error making direct connection: %s\n", error_message); - -- connect_cb(data, source, PURPLE_INPUT_READ); -+ /* connect_cb(data, source, PURPLE_INPUT_READ); */ -+ connect_cb(data, source, error_message); - } - - gboolean diff --git a/pidgin-mono-buildfix.patch b/pidgin-mono-buildfix.patch new file mode 100644 index 0000000..70662b7 --- /dev/null +++ b/pidgin-mono-buildfix.patch @@ -0,0 +1,9 @@ +Index: pidgin-2.7.3/libpurple/plugins/mono/loader/status-glue.c +=================================================================== +--- pidgin-2.7.3.orig/libpurple/plugins/mono/loader/status-glue.c ++++ pidgin-2.7.3/libpurple/plugins/mono/loader/status-glue.c +@@ -1,3 +1,4 @@ ++#include + #include "status.h" + #include "mono-helper.h" + #include "mono-glue.h" diff --git a/pidgin-nonblock-common.patch b/pidgin-nonblock-common.patch index cc38281..8b04454 100644 --- a/pidgin-nonblock-common.patch +++ b/pidgin-nonblock-common.patch @@ -1,17 +1,17 @@ -Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c -================================================================================ ---- pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c -+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c -@@ -303,8 +303,6 @@ - if(gnutls_data->handshake_handler) - purple_input_remove(gnutls_data->handshake_handler); +Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c +=================================================================== +--- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-gnutls.c ++++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c +@@ -453,8 +453,6 @@ ssl_gnutls_close(PurpleSslConnection *gs + if (gnutls_data->handshake_timer) + purple_timeout_remove(gnutls_data->handshake_timer); - gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR); - gnutls_deinit(gnutls_data->session); g_free(gnutls_data); -@@ -339,6 +337,22 @@ +@@ -489,6 +487,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc } static size_t @@ -34,7 +34,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); -@@ -931,6 +945,23 @@ +@@ -1148,6 +1162,23 @@ static PurpleCertificateScheme x509_gnut }; @@ -58,7 +58,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c static PurpleSslOps ssl_ops = { ssl_gnutls_init, -@@ -938,7 +969,9 @@ +@@ -1155,7 +1186,9 @@ static PurpleSslOps ssl_ops = ssl_gnutls_connect, ssl_gnutls_close, ssl_gnutls_read, @@ -68,9 +68,11 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c ssl_gnutls_get_peer_certificates, /* padding */ ---- pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c -+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c -@@ -880,6 +880,8 @@ +Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c +=================================================================== +--- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-nss.c ++++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c +@@ -958,6 +958,8 @@ static PurpleSslOps ssl_ops = ssl_nss_connect, ssl_nss_close, ssl_nss_read, @@ -79,8 +81,10 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c ssl_nss_write, ssl_nss_peer_certs, ---- pidgin-2.5.5/libpurple/purple-fifo.c -+++ pidgin-2.5.5/libpurple/purple-fifo.c +Index: pidgin-2.7.3/libpurple/purple-fifo.c +=================================================================== +--- /dev/null ++++ pidgin-2.7.3/libpurple/purple-fifo.c @@ -0,0 +1,232 @@ +/* + * @file purple-fifo.c A FIFO byte queue. @@ -314,8 +318,10 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c + + return TRUE; +} ---- pidgin-2.5.5/libpurple/purple-fifo.h -+++ pidgin-2.5.5/libpurple/purple-fifo.h +Index: pidgin-2.7.3/libpurple/purple-fifo.h +=================================================================== +--- /dev/null ++++ pidgin-2.7.3/libpurple/purple-fifo.h @@ -0,0 +1,54 @@ +/** + * @file purple-fifo.h A FIFO byte queue. @@ -371,8 +377,10 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c +G_END_DECLS + +#endif /* _purple_fifo_H_ */ ---- pidgin-2.5.5/libpurple/purple-io.c -+++ pidgin-2.5.5/libpurple/purple-io.c +Index: pidgin-2.7.3/libpurple/purple-io.c +=================================================================== +--- /dev/null ++++ pidgin-2.7.3/libpurple/purple-io.c @@ -0,0 +1,391 @@ +/* + * @file purple-io.c Buffering I/O layer. @@ -765,8 +773,10 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c +{ + return purple_fifo_get_used (io->write_fifo); +} ---- pidgin-2.5.5/libpurple/purple-io.h -+++ pidgin-2.5.5/libpurple/purple-io.h +Index: pidgin-2.7.3/libpurple/purple-io.h +=================================================================== +--- /dev/null ++++ pidgin-2.7.3/libpurple/purple-io.h @@ -0,0 +1,87 @@ +/** + * @file purple-io.h Buffering I/O layer. @@ -855,9 +865,11 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c +G_END_DECLS + +#endif /* _PURPLE_IO_H_ */ ---- pidgin-2.5.5/libpurple/sslconn.c -+++ pidgin-2.5.5/libpurple/sslconn.c -@@ -263,6 +263,27 @@ +Index: pidgin-2.7.3/libpurple/sslconn.c +=================================================================== +--- pidgin-2.7.3.orig/libpurple/sslconn.c ++++ pidgin-2.7.3/libpurple/sslconn.c +@@ -272,6 +272,27 @@ purple_ssl_read(PurpleSslConnection *gsc } size_t @@ -885,7 +897,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) { PurpleSslOps *ops; -@@ -286,6 +307,27 @@ +@@ -295,6 +316,27 @@ purple_ssl_get_peer_certificates(PurpleS return (ops->get_peer_certificates)(gsc); } @@ -913,9 +925,11 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c void purple_ssl_set_ops(PurpleSslOps *ops) { ---- pidgin-2.5.5/libpurple/sslconn.h -+++ pidgin-2.5.5/libpurple/sslconn.h -@@ -34,6 +34,12 @@ +Index: pidgin-2.7.3/libpurple/sslconn.h +=================================================================== +--- pidgin-2.7.3.orig/libpurple/sslconn.h ++++ pidgin-2.7.3/libpurple/sslconn.h +@@ -34,6 +34,12 @@ typedef enum PURPLE_SSL_CERTIFICATE_INVALID = 3 } PurpleSslErrorType; @@ -928,7 +942,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c #include "certificate.h" #include "proxy.h" -@@ -115,6 +121,7 @@ +@@ -115,6 +121,7 @@ typedef struct * @see purple_ssl_read */ size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len); @@ -936,7 +950,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c /** Writes data to a connection (like POSIX send()) * @param gsc Connection context * @param data Data buffer to send data from -@@ -124,6 +131,7 @@ +@@ -124,6 +131,7 @@ typedef struct * @see purple_ssl_write */ size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len); @@ -944,7 +958,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c /** Obtains the certificate chain provided by the peer * * @param gsc Connection context -@@ -256,6 +264,17 @@ +@@ -281,6 +289,17 @@ void purple_ssl_close(PurpleSslConnectio size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len); /** @@ -962,7 +976,7 @@ Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c * Writes data to an SSL connection. * * @param gsc The SSL connection handle. -@@ -278,6 +297,17 @@ +@@ -303,6 +322,17 @@ size_t purple_ssl_write(PurpleSslConnect */ GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc); diff --git a/pidgin-oscar-clientlogin.patch b/pidgin-oscar-clientlogin.patch deleted file mode 100644 index abc3e6a..0000000 --- a/pidgin-oscar-clientlogin.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pidgin-2.6.6/libpurple/protocols/oscar/clientlogin.c -=================================================================== ---- pidgin-2.6.6.orig/libpurple/protocols/oscar/clientlogin.c -+++ pidgin-2.6.6/libpurple/protocols/oscar/clientlogin.c -@@ -43,7 +43,7 @@ - #include "core.h" - - #define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin" --#define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession" -+#define URL_START_OSCAR_SESSION "https://api.oscar.aol.com/aim/startOSCARSession" - - /* - * Using clientLogin requires a developer ID. This key is for libpurple. diff --git a/pidgin-oscar-portability.patch b/pidgin-oscar-portability.patch deleted file mode 100644 index b70ba43..0000000 --- a/pidgin-oscar-portability.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pidgin-2.6.6/libpurple/protocols/oscar/oscar.c -=================================================================== ---- pidgin-2.6.6.orig/libpurple/protocols/oscar/oscar.c -+++ pidgin-2.6.6/libpurple/protocols/oscar/oscar.c -@@ -3701,7 +3701,7 @@ static int purple_conv_chat_incoming_msg - if (utf8 == NULL) - /* The conversion failed! */ - utf8 = g_strdup(_("[Unable to display a message from this user because it contained invalid characters.]")); -- serv_got_chat_in(gc, ccon->id, info->bn, 0, utf8, time((time_t)NULL)); -+ serv_got_chat_in(gc, ccon->id, info->bn, 0, utf8, time((time_t *)NULL)); - g_free(utf8); - - return 1; diff --git a/pidgin.changes b/pidgin.changes index 97bfe48..45c1097 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,77 @@ +------------------------------------------------------------------- +Sun Aug 15 18:49:24 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.7.3: + + For a complete overview of changes, see NEWS file. Here are + some highlights (excluding many bug fixes). + + Pidgin: + - Re-arrange media window to make it more netbook-friendly. + + Finch: + - Rebindable 'suggest-next-page' and 'suggest-prev-page' + actions for textboxes. + - Rebindable 'dropdown' action for comboboxes. + + MSN: + - Support for web-based buddy icons. + + MXit: + - Many improvements. + + Yahoo/Yahoo JAPAN: + - Proxy handling improvements. + - Fix file transfers that get stuck with "Waiting for transfer + to begin". +- Changes from version 2.7.2: + + Fix crashes, including CVE-2010-2528. +- Changes from version 2.7.1: + + Pidgin: + - Restore the tray icon's blinking functionality. + + MSN: + - Support for direct connections, enabling faster file + transfers, smiley and buddy icon loading. + + MXit: + - Add the standard MXit emoticons. + - Increment protocol version to v6.0. +- Changes from version 2.7.0: + + Pidgin: + - Add UI for sending attentions (buzz, nudge) on supporting + protocols. + - Make the search dialog unobtrusive in the conversation + window. + - The Recent Log Activity sort method for the Buddy List now + distinguishes between no activity and a small amount of + activity in the distant past. + - Add a menu set mood globally for all mood-supporting + accounts. + - Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in + conversation windows. + - The 'Message Timestamp Formats' plugin allows changing the + timestamp format from the timestamps' context menu in + conversation log, and allows forcing 12-hour timestamps. + - Show file transfer thumbnails for images on supporting + protocols (MSN). + + Bonjour: Add support for IPv6. + + AIM and ICQ: + - X-Status (Custom ICQ status icon) support. + - Support sending and receiving HTML-formatted messages for + ICQ. + + MSN: + - Support for version 9 of the MSN protocol has been removed. + - Support file transfer thumbnails (previews) for images. + - Fix CVE-2010-1624. + + Finch: + - New action 'history-search', with default binding ctrl+r, to + search the entered string in the input history. +- Drop upstream included patches: + + pidgin-directconn-argfix.patch + + pidgin-oscar-clientlogin.patch + + pidgin-oscar-portability.patch + + pidgin-bnc550170-qq-2008only.patch (bnc#569271) + + includes.patch (bnc#569271#6) +- Add pidgin-mono-buildfix.patch: fix build of mono plugin loader. +- Remove the conditional checks for openSUSE 10.2 and 10.3, + simplifying the spec file a lot. +- Pass --enable-gevolution to configure to actually activate the + plugin +- Split out pidgin-evolution package containing the evo plugin. + ------------------------------------------------------------------- Tue Mar 30 21:41:02 UTC 2010 - dimstar@opensuse.org diff --git a/pidgin.spec b/pidgin.spec index e4af335..d077226 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,5 +1,5 @@ # -# spec file for package pidgin (Version 2.6.6) +# spec file for package pidgin (Version 2.7.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.6.6 -Release: 2 +Version: 2.7.3 +Release: 1 License: GPLv2+ Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -34,23 +34,17 @@ Patch2: pidgin-nonblock-aim.patch Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch -Patch9: includes.patch -# PATCH-FIX-UPSTREAM: pidgin-directconn-argfix.patch -Patch11: pidgin-directconn-argfix.patch Patch12: pidgin-dbus-invalid-gpointer.patch # PATCH-FIX-OPENSUSE pidgin-browser-default.patch bnc472219 sbrabec@suse.cz - Use xdg-open as default browser. Patch13: pidgin-browser-default.patch -Patch15: pidgin-bnc550170-qq-2008only.patch -# PATCH-FIX-UPSTREAM pidgin-oscar-portability.patch dimstar@opensuse.org -- Fix portability issue to x86_64 -Patch16: pidgin-oscar-portability.patch -# PATCH-FIX-UPSTREAM pidgin-oscar-clientlogin.patch deb#571413 -- Fix connections to Oscar network. -Patch17: pidgin-oscar-clientlogin.patch +# PATCH-FIX-UPSTREAM pidgin-mono-buildfix.patch http://developer.pidgin.im/ticket/12506 dimstar@opensuse.org -- Fix build with mono plugin loader; missing include statements. +Patch14: pidgin-mono-buildfix.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel BuildRequires: doxygen BuildRequires: evolution-data-server-devel -%if %suse_version > 1110 || 0%{?opensuse_bs_prj_GNOME_Factory} +%if %suse_version > 1110 BuildRequires: farsight2-devel %endif %if %suse_version < 1020 @@ -61,7 +55,7 @@ BuildRequires: gtk-doc BuildRequires: gtkspell-devel BuildRequires: intltool BuildRequires: libidn-devel -%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory} +%if %{suse_version} > 1030 BuildRequires: libgadu-devel %endif # There is no way to discriminate openSUSE 11.1 and SLE11. That is why we recognize openSUSE 11.1 as SLE. @@ -73,7 +67,7 @@ BuildRequires: libgadu-devel %endif # gnome-keyring support summary (bnc#566286): # SLE10, 11.0, 11.1: patch present and broken (does nothing) -# SLE11: patch present and active (bnc#569025) +# SLE11: patch present and active (bnc#569025) # 11.2: patch was present and active removed by an opdate # 11.3 and above: patch not applied # For openSUSE, it's better to avoid this patch: @@ -116,7 +110,7 @@ BuildRequires: translation-update-upstream %endif BuildRequires: update-desktop-files BuildRequires: NetworkManager-devel -%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory} +%if %suse_version > 1030 BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel %else @@ -133,7 +127,7 @@ BuildRequires: dbus-1-devel dbus-1-glib BuildRequires: fdupes %endif BuildRequires: libnotify-devel -%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory} +%if %suse_version > 1030 BuildRequires: libavahi-glib-devel %else BuildRequires: avahi-devel avahi-glib @@ -217,6 +211,7 @@ Provides: gaim-devel = %{version} Obsoletes: gaim-devel <= 1.5.0 Provides: gaim-unstable-devel = %{version} Obsoletes: gaim-unstable-devel < 2.0.0 + %if %suse_version >= 1030 %package -n libpurple-meanwhile @@ -226,6 +221,13 @@ 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} +Supplements: packageand(%{name}:evolution-data-server) + %package -n libpurple-mono License: GPLv2+ Summary: Mono .NET Plugin Support for Pidgin @@ -280,6 +282,9 @@ client. Lotus Sametime plugin for Pidgin using the Meanwhile library. %endif +%description evolution +Evolution integration plugin for Pidgin + %description -n libpurple-mono Mono plugin loader for Pidgin. This package will allow you to write or use Pidgin plugins written in the .NET programming language. @@ -315,24 +320,19 @@ translation-update-upstream %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch9 -p1 -%patch11 -p1 %patch12 %patch13 -%patch15 -p0 -%patch16 -p1 -%patch17 -p1 +%patch14 -p1 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* -%{__sed} -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac +%{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac %build export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" export FFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC" export LDFLAGS="-pie" -ACLOCAL="aclocal -I m4macros" autoreconf -f -i -intltoolize --force +autoreconf -fi %configure\ --disable-static\ %if %suse_version < 1120 @@ -346,6 +346,7 @@ intltoolize --force %else --disable-mono\ %endif + --enable-gevolution\ --enable-gstreamer\ %if 0%{?building_for_sle_ge_11} --enable-gnome-keyring\ @@ -354,7 +355,7 @@ intltoolize --force --enable-dbus\ --enable-devhelp\ %if %suse_version < 1030 - --disable-meanwhile \ + --disable-meanwhile\ %endif --with-tclconfig=%{_libdir}\ --with-tkconfig=%{_libdir}\ @@ -389,7 +390,8 @@ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ %{__grep} -v /tcl.so | \ %{__grep} -v ".dll$" > %{name}-%{version}-purpleplugins find $RPM_BUILD_ROOT%{_libdir}/pidgin -maxdepth 1 -xtype f -print | \ - %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins + %{__sed} "s@^$RPM_BUILD_ROOT@@g" | \ + %{__grep} -v /gevolution.so > %{name}-%{version}-pidginplugins find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins %find_gconf_schemas @@ -441,6 +443,10 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %{_libdir}/pkgconfig/pidgin.pc %doc %{_mandir}/man3/Pidgin.* +%files evolution +%defattr(-, root, root) +%{_libdir}/pidgin/gevolution.so + %files -n libpurple -f %{name}-%{version}-purpleplugins %defattr(-, root, root) %doc libpurple/purple-notifications-example @@ -454,6 +460,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %{_libdir}/libpurple-client.so.* %dir %{_libdir}/purple-2 %{_libdir}/purple-2/perl + %if %suse_version > 1030 %files -n libpurple-lang -f %{name}.lang @@ -486,13 +493,16 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %dir %{_datadir}/locale/ur %dir %{_datadir}/locale/ur/LC_MESSAGES %endif + %if %suse_version >= 1030 %files -n libpurple-meanwhile %defattr(-, root, root) %{_libdir}/purple-2/libsametime.* %endif + %ifnarch ppc64 + %if %suse_version > 1010 %files -n libpurple-mono