rpms/pidgin/devel .cvsignore, 1.36, 1.37 pidgin.spec, 1.105, 1.106 sources, 1.36, 1.37 one_time_password.c, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19006

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	one_time_password.c 
Log Message:
- 2.6.5
- CVE-2010-0013
- Other bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	30 Nov 2009 06:14:14 -0000	1.36
+++ .cvsignore	8 Jan 2010 20:09:42 -0000	1.37
@@ -1 +1 @@
-pidgin-2.6.4.tar.bz2
+pidgin-2.6.5.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- pidgin.spec	8 Dec 2009 17:29:38 -0000	1.105
+++ pidgin.spec	8 Jan 2010 20:09:43 -0000	1.106
@@ -97,8 +97,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.4
-Release:	4%{?dist}
+Version:	2.6.5
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -125,8 +125,6 @@ ExcludeArch:    s390 s390x
 # - Browser "GNOME Default"
 # - Smiley Theme "Default"
 Source1:	purple-fedora-prefs.xml
-Source2:        one_time_password.c
-
 
 ## Patches 0-99: Fedora specific or upstream wont accept
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
@@ -453,8 +451,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
-# one_time_password plugin, to be merged upstream soon
-cp %{SOURCE2} libpurple/plugins/
+# one_time_password plugin, included upstream but not built by default
 cd libpurple/plugins/
 make one_time_password.so
 cd -
@@ -643,6 +640,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan  7 2010 Warren Togami <wtogami at redhat.com> - 2.6.5-1
+- 2.6.5
+- CVE-2010-0013
+- Other bug fixes
+
 * Tue Dec  8 2009 Warren Togami <wtogami at redhat.com> - 2.6.4-4
 - temporarily disable evolution integration in F13 until it is fixed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	30 Nov 2009 06:14:14 -0000	1.36
+++ sources	8 Jan 2010 20:09:44 -0000	1.37
@@ -1 +1 @@
-6e1dc8b9dd6983a54ff3a6de33efa778  pidgin-2.6.4.tar.bz2
+90847ed22ec830db5d9768748812b661  pidgin-2.6.5.tar.bz2


--- one_time_password.c DELETED ---