Accepting request 29608 from GNOME:Apps

Copy from GNOME:Apps/pidgin based on submit request 29608 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/29608
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=49

pidgin-2.6.4.tar.bz2

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

pidgin-2.6.5.tar.bz2

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

pidgin.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Jan 14 19:12:02 CET 2010 - sbrabec@suse.cz
+
+- Updated to version 2.6.5:
+  + libpurple:
+    - TLS certificates are actually stored to the local cache once
+      again (accepting a name mismatch on a certificate should now
+      be remembered)
+  + General:
+    + Build-time fixes for Solaris.
+  + AIM and ICQ:
+    - Messages from some mobile clients are no longer displayed as
+      Chinese characters (broken in 2.6.4)
+  + MSN:
+    - Fix an issue allowing a remote user to download arbitrary
+      files from a libpurple client. (CVE-2010-0013, bnc#567799)
+  + XMPP:
+    - Do not crash when attempting to register for a new account on
+      Windows.
+    - Fix file transfer with clients that do not support Entity
+      Capabilities (e.g. Spark)
+- Disabled GNOME keyring integration for openSUSE (bnc#566286).
+
+-------------------------------------------------------------------
+Mon Jan  4 13:06:04 CET 2010 - vuntz@opensuse.org
+
+- Change gnome-keyring-devel BuildRequires to
+  libgnome-keyring-devel on 11.3 and later, following the module
+  split upstream.
+
 -------------------------------------------------------------------
 Wed Dec 16 14:49:51 CET 2009 - vuntz@opensuse.org
 

pidgin.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package pidgin (Version 2.6.4)
+# spec file for package pidgin (Version 2.6.5)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,8 +20,8 @@
 
 Name:           pidgin
 Summary:        GTK+-Based Multiprotocol Instant Messaging Client
-Version:        2.6.4
+Version:        2.6.5
-Release:        2
+Release:        1
 License:        GPLv2+
 Group:          Productivity/Networking/Instant Messenger
 Url:            http://www.pidgin.im/
@@ -49,7 +49,6 @@ BuildRequires:  evolution-data-server-devel
 %if %suse_version > 1110 || 0%{?opensuse_bs_prj_GNOME_Factory}
 BuildRequires:  farsight2-devel
 %endif
-BuildRequires:  gnome-keyring-devel
 %if %suse_version < 1020
 BuildRequires:  gnome-icon-theme
 %endif
@@ -61,6 +60,30 @@ BuildRequires:  libidn-devel
 %if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory}
 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.
+# Ugly, but there is no other way. (bnc#566286#c17).
+%if %suse_version == 1110
+%define building_for_sle_ge_11 1
+%else
+%define building_for_sle_ge_11 0
+%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)
+# 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:
+# + does not work well outside GNOME
+# - passwords are stored in readable form
+%if 0%{?suse_version} > 1120
+%if 0%{?building_for_sle_ge_11}
+BuildRequires:  libgnome-keyring-devel
+%endif
+%else
+%if 0%{?building_for_sle_ge_11}
+BuildRequires:  gnome-keyring-devel
+%endif
+%endif
 BuildRequires:  libstdc++-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt
@@ -119,7 +142,7 @@ Requires:       openssl-certs
 %endif
 Requires:       perl-base = %{perl_version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# Existed before 10.3:
+# Existed before 10.3 and SLED10 before SP2:
 Obsoletes:      gaim <= 1.5.0
 # Has never been in SuSE:
 Obsoletes:      gaim-applet
@@ -175,7 +198,16 @@ Requires:       openssl-certs
 License:        GPLv2+
 Summary:        Development Headers, Documentation, and Libraries for libpurple
 Group:          Productivity/Networking/Instant Messenger
-Requires:       libpurple = %{version} NetworkManager-devel NetworkManager-glib glib2-devel gnome-keyring-devel libxml2-devel
+Requires:       libpurple = %{version} NetworkManager-devel NetworkManager-glib glib2-devel libxml2-devel
+%if 0%{?suse_version} > 1120
+%if 0%{?building_for_sle_ge_11}
+Requires:       libgnome-keyring-devel
+%endif
+%else
+%if 0%{?building_for_sle_ge_11}
+Requires:       gnome-keyring-devel
+%endif
+%endif
 Requires:       pkg-config
 Provides:       gaim-devel = %{version}
 Obsoletes:      gaim-devel <= 1.5.0
@@ -271,7 +303,9 @@ and plugins.
 %if %suse_version > 1110
 translation-update-upstream
 %endif
+%if 0%{?building_for_sle_ge_11}
 %patch1 -p1
+%endif
 # FIXME: Port this patch:
 #%patch2 -p1
 %patch3 -p1
@@ -307,7 +341,9 @@ intltoolize --force
 	--disable-mono\
 %endif
 	--enable-gstreamer\
+%if 0%{?building_for_sle_ge_11}
 	--enable-gnome-keyring\
+%endif
 	--enable-nm\
 	--enable-dbus\
 	--enable-devhelp\
@@ -325,6 +361,7 @@ intltoolize --force
 %{makeinstall}
 %{perl_process_packlist}
 %suse_update_desktop_file -N Pidgin -G "Instant Messenger" %{name}
+# Provide only upstream emotes in openSUSE >= 11.2 and SLE > 11 (see bnc#569271#c1):
 %if %suse_version < 1120
 cp -a NLD $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes
 cp -a Tango $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes
@@ -417,7 +454,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \
 %endif
 %defattr(-, root, root)
 # These locales are not yet included in respective products:
-%if %suse_version < 1130
+%if %suse_version <= 1120
 %dir %{_datadir}/locale/ms_MY
 %dir %{_datadir}/locale/ms_MY/LC_MESSAGES
 %endif