rpms/pidgin/F-9 .cvsignore, 1.23, 1.24 pidgin.spec, 1.65, 1.66 sources, 1.23, 1.24

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2286/F-9

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Pidgin 2.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	7 Mar 2009 17:22:07 -0000	1.23
+++ .cvsignore	21 May 2009 12:43:59 -0000	1.24
@@ -1 +1 @@
-pidgin-2.5.5.tar.bz2
+pidgin-2.5.6.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- pidgin.spec	7 Mar 2009 17:22:08 -0000	1.65
+++ pidgin.spec	21 May 2009 12:43:59 -0000	1.66
@@ -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 <stu at nosnilmot.com> 2.5.6-1
+- 2.5.6
+
+* Mon Apr 20 2009 Warren Togami <wtogami at redhat.com> 2.5.5-3
+- F12+ removed krb4
+
 * Tue Mar 03 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.5-1
 - 2.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	7 Mar 2009 17:22:08 -0000	1.23
+++ sources	21 May 2009 12:43:59 -0000	1.24
@@ -1 +1 @@
-972101ca88a2ad338aad1fc4be5e1a8c  pidgin-2.5.5.tar.bz2
+75bf724a61047eaaecad869ab452e475  pidgin-2.5.6.tar.bz2