From 2662b62fbd8e47be77c88109647c97561b22ca5c Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Aug 18 2009 17:30:01 +0000
Subject: - CVE-2009-2694

- Voice and Video support via farsight2 (Fedora 11+)
- Numerous other bug fixes

---

diff --git a/.cvsignore b/.cvsignore
index df1ccdc..3eb82e8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pidgin-2.6.0-devel-20090812.tar.bz2
+pidgin-2.6.0.tar.bz2
diff --git a/pidgin.spec b/pidgin.spec
index d04c020..76f97fc 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -82,15 +82,14 @@
 
 Name:		pidgin
 Version:	2.6.0
-%define snapshot 20090812
-Release:	0.11.%{snapshot}%{?dist}
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
 # MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
-Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}-devel-%{snapshot}.tar.bz2
+Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
 Obsoletes:      gaim < 999:1
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
@@ -367,7 +366,7 @@ Doxygen generated API documentation.
 
 %prep
 echo "FEDORA=%{fedora} RHEL=%{rhel}"
-%setup -q -n pidgin-2.6.0devel
+%setup -q 
 ## Patches 0-99: Fedora specific or upstream wont accept
 %if %{force_sound_aplay}
 %patch0 -p1 -b .aplay
@@ -615,6 +614,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Warren Togami <wtogami@redhat.com> 2.6.0-1
+- CVE-2009-2694
+- Voice and Video support via farsight2 (Fedora 11+)
+- Numerous other bug fixes
+
 * Tue Aug 06 2009 Warren Togami <wtogami@redhat.com> 2.6.0-0.11.20090812
 - new snapshot at the request of maiku
 
diff --git a/sources b/sources
index de4f321..cc7a00a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-592fc737e76149e842e4e33a89e2d45a  pidgin-2.6.0-devel-20090812.tar.bz2
+235d8c322d42b711d3ce82b625f5526a  pidgin-2.6.0.tar.bz2