diff --git a/.gitignore b/.gitignore index 64fa347..7aec76c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ pidgin-2.7.3.tar.bz2 /pidgin-2.7.11.tar.bz2 /pidgin-2.8.0.tar.bz2 /pidgin-2.9.0.tar.bz2 +/pidgin-2.10.0.tar.bz2 diff --git a/pidgin.spec b/pidgin.spec index 034cf69..1686920 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -39,6 +39,7 @@ %global disable_silc 0 %global split_evolution 0 %global use_system_certs 0 +%global use_system_libgadu 0 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer %if 0%{?fedora} < 5 @@ -95,10 +96,14 @@ %if 0%{?fedora} >= 13 %global split_evolution 1 %endif +# F16+ Use system libgadu (#713888) +%if 0%{?fedora} >= 16 +%global use_system_libgadu 1 +%endif Name: pidgin -Version: 2.9.0 -Release: 3%{?dist} +Version: 2.10.0 +Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -238,6 +243,10 @@ Requires: gstreamer-plugins-bad-free %if %{libidn_support} BuildRequires: libidn-devel %endif +# use system libgadu (F13+) +%if %{use_system_libgadu} +BuildRequires: libgadu-devel +%endif %if %{api_docs} BuildRequires: doxygen @@ -680,6 +689,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Aug 21 2011 Stu Tomlinson 2.10.0-1 +- 2.10.0 +- Link against system libgadu instead of using internal copy (#713888) + * Tue Aug 16 2011 Milan Crha 2.9.0-3 - Rebuild against newer evolution-data-server diff --git a/sources b/sources index 60f8017..01bea23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cd285c7a40f93b7a51bfe733971d3a6 pidgin-2.9.0.tar.bz2 +e1453c9093c4f32beec19abd14069a3f pidgin-2.10.0.tar.bz2