From 3d65d3a2713b8400cebf063203d2a90d764d9e77 Mon Sep 17 00:00:00 2001 From: Stu Tomlinson Date: May 21 2009 12:43:59 +0000 Subject: Pidgin 2.5.6 --- diff --git a/.cvsignore b/.cvsignore index 00d5178..c0925be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pidgin-2.5.5.tar.bz2 +pidgin-2.5.6.tar.bz2 diff --git a/pidgin.spec b/pidgin.spec index 08f1063..13052c8 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -28,6 +28,7 @@ %define perl_devel_separated 0 %define perl_embed_separated 0 %define api_docs 0 +%define krb4_removed 0 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer %if 0%{?fedora} < 5 @@ -59,9 +60,14 @@ %define perl_embed_separated 1 %define api_docs 1 %endif +# F12+: krb4 removed +%if 0%{?fedora} >= 12 +%define krb4_removed 1 +%endif + Name: pidgin -Version: 2.5.5 +Version: 2.5.6 Release: 1%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls @@ -129,8 +135,10 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: libxml2-devel +%if ! %{krb4_removed} # krb5 needed for Zephyr (FC1+) BuildRequires: krb5-devel +%endif # gtkspell integration (FC1+) BuildRequires: gtkspell-devel, aspell-devel # Evolution integration (FC3+) @@ -349,7 +357,9 @@ fi %build SWITCHES="--with-extraversion=%{release}" +%if ! %{krb4_removed} SWITCHES="$SWITCHES --with-krb4" +%endif SWITCHES="$SWITCHES --enable-perl" SWITCHES="$SWITCHES --enable-gevolution" %if %{dbus_integration} @@ -571,6 +581,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed May 20 2009 Stu Tomlinson 2.5.6-1 +- 2.5.6 + +* Mon Apr 20 2009 Warren Togami 2.5.5-3 +- F12+ removed krb4 + * Tue Mar 03 2009 Stu Tomlinson 2.5.5-1 - 2.5.5 diff --git a/sources b/sources index e7f8bbb..1b0a815 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -972101ca88a2ad338aad1fc4be5e1a8c pidgin-2.5.5.tar.bz2 +75bf724a61047eaaecad869ab452e475 pidgin-2.5.6.tar.bz2