rpms/amsn/F-9 amsn-0.97-noCVR0.patch,NONE,1.1 amsn.spec,1.17,1.18

[Sander Hoentjen (tjikkun)]

Author: tjikkun

Update of /cvs/pkgs/rpms/amsn/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8806

Modified Files:
	amsn.spec 
Added Files:
	amsn-0.97-noCVR0.patch 
Log Message:
add patch to make sure amsn can still login after a recent server protocol change


amsn-0.97-noCVR0.patch:

--- NEW FILE amsn-0.97-noCVR0.patch ---
diff -ru amsn-0.97.orig/protocol.tcl amsn-0.97/protocol.tcl
--- amsn-0.97.orig/protocol.tcl	2008-06-26 21:03:56.000000000 +0200
+++ amsn-0.97/protocol.tcl	2008-06-26 21:09:12.000000000 +0200
@@ -5329,10 +5329,18 @@
 		}
 
 		v {
+
+			if { [::config::getKey protocol] == 13 } {
+				set ver "MSNP13"
+			} else {
+				set ver "MSNP12"
+			}
+
 			if {[lindex $recv 0] != "VER"} {
 				status_log "cmsn_auth: was expecting VER reply but got a [lindex $recv 0]\n" red
 				return 1
-			} elseif {[lsearch -exact $recv "CVR0"] != -1} {
+			} elseif {[lsearch -exact $recv $ver] != -1} {
+				status_log "Logged in with protocol $ver"
 				if {[lsearch -exact $recv "MSNP13"] != -1} {
 					set ::msnp13 1
 					source msnp13.tcl


Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-9/amsn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amsn.spec	12 Feb 2008 10:35:15 -0000	1.17
+++ amsn.spec	26 Jun 2008 19:34:01 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.97
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -12,11 +12,13 @@
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf, desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
+BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
 BuildRequires:  tcl(abi) = %{tcl_version}
 Requires:       tcl(abi) = %{tcl_version}
 Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils, alsa-utils
 
+Patch1: 	amsn-0.97-noCVR0.patch
+
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
 It is written in tcl/tk and supports filetransfers, webcam, etc.
@@ -34,6 +36,9 @@
 
 %prep
 %setup -q
+
+%patch1 -p1 -b .1-noCVR0
+
 rm -r utils/bwidget1.8.0
 rm -r skins/default/winicons
 
@@ -49,8 +54,6 @@
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
 %{__sed} -i 's#Info=AMSN#X-Info=AMSN#' amsn.desktop
 
-autoconf
-
 %build
 %configure --enable-debug
 make %{?_smp_mflags}
@@ -125,6 +128,9 @@
 
 
 %changelog
+* Thu Jun 26 2008 Sander Hoentjen <sander at hoentjen.eu> - 0.97-4
+- Added patch for server protocol change that breaks amsn login
+
 * Thu Feb 12 2008 Sander Hoentjen <sander at hoentjen.eu> - 0.97-3
 - Rebuilt for gcc-4.3