rpms/pidgin/F-12 .cvsignore, 1.35, 1.36 pidgin.spec, 1.99, 1.100 sources, 1.35, 1.36 pidgin-2.6.2-crash-validate-jid.patch, 1.2, NONE pidgin-2.6.2-yahoo-buddy-idle-time.patch, 1.1, NONE pidgin-2.6.2-yahoo-status-change-away.patch, 1.1, NONE pidgin-2.6.3-msn_servconn_disconnect-crash.patch, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	.cvsignore pidgin.spec sources 
Removed Files:
	pidgin-2.6.2-crash-validate-jid.patch 
	pidgin-2.6.2-yahoo-buddy-idle-time.patch 
	pidgin-2.6.2-yahoo-status-change-away.patch 
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
2.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	16 Oct 2009 20:10:47 -0000	1.35
+++ .cvsignore	30 Nov 2009 06:17:40 -0000	1.36
@@ -1 +1 @@
-pidgin-2.6.3.tar.bz2
+pidgin-2.6.4.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- pidgin.spec	19 Oct 2009 18:12:27 -0000	1.99
+++ pidgin.spec	30 Nov 2009 06:17:41 -0000	1.100
@@ -14,6 +14,10 @@
 %define fedora 6
 %define dist .el5
 %endif
+%if 0%{?rhel} == 6
+%define fedora 12
+%define dist .el6
+%endif
 
 # Define variables to use in conditionals
 %define force_sound_aplay       0
@@ -81,8 +85,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.3
-Release:	2%{?dist}
+Version:	2.6.4
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,10 +120,7 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
-Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
-Patch103: pidgin-2.6.2-crash-validate-jid.patch
-Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
+#Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -377,10 +378,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch101 -p0 -b .yahoo-buddy-idle-time
-%patch102 -p0 -b .yahoo-status-change-away
-%patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
-%patch104 -p0 -b .msn_servconn_disconnect-crash
+#%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -625,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Nov 30 2009 Warren Togami <wtogami at redhat.com> 2.6.4-1
+- 2.6.4
+
 * Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
 - Upstream backport:
     3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	16 Oct 2009 20:10:47 -0000	1.35
+++ sources	30 Nov 2009 06:17:41 -0000	1.36
@@ -1 +1 @@
-8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2
+6e1dc8b9dd6983a54ff3a6de33efa778  pidgin-2.6.4.tar.bz2


--- pidgin-2.6.2-crash-validate-jid.patch DELETED ---


--- pidgin-2.6.2-yahoo-buddy-idle-time.patch DELETED ---


--- pidgin-2.6.2-yahoo-status-change-away.patch DELETED ---


--- pidgin-2.6.3-msn_servconn_disconnect-crash.patch DELETED ---