dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-amsn-0.97.tar.bz2

.gitignore

@@ -0,0 +1 @@
+amsn-0.97.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: amsn
-# $Id$
-NAME := amsn
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

amsn-0.97-noCVR0.patch

@@ -0,0 +1,23 @@
+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

amsn.spec

@@ -2,8 +2,8 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:           amsn
-Version:        0.97
-Release:        3%{?dist}
+Version:        0.97.2
+Release:        1%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -12,7 +12,7 @@ URL:            http://www.amsn-project.net/
 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
@@ -34,6 +34,7 @@ snapshots with your webcam to use as your display picture.
 
 %prep
 %setup -q
+
 rm -r utils/bwidget1.8.0
 rm -r skins/default/winicons
 
@@ -49,8 +50,6 @@ rm -r skins/default/winicons
 %{__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 +124,12 @@ fi
 
 
 %changelog
+* Wed Aug 06 2008 Sander Hoentjen <sander@hoentjen.eu> - 0.97.2-1
+- Update to latest release
+
+* Thu Jun 26 2008 Sander Hoentjen <sander@hoentjen.eu> - 0.97-4
+- Added patch for server protocol change that breaks amsn login
+
 * Thu Feb 12 2008 Sander Hoentjen <sander@hoentjen.eu> - 0.97-3
 - Rebuilt for gcc-4.3
 

sources

@@ -1 +1 @@
-493627afc2dc38d94500499e9ec34404  amsn-0.97.tar.bz2
+6c494d97b5ab810f1b265ef19bf652b0  amsn-0.97.2.tar.bz2