packages: amsn/amsn.spec, amsn/amsn-no-exact-http.patch (NEW), amsn/amsn-so...

[glen]

Author: glen                         Date: Thu Feb 25 22:55:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add -no-exact-http.patch, -songbird-exception.patch from fc; update deps

---- Files affected:
packages/amsn:
   amsn.spec (1.35 -> 1.36) , amsn-no-exact-http.patch (NONE -> 1.1)  (NEW), amsn-songbird-exception.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/amsn/amsn.spec
diff -u packages/amsn/amsn.spec:1.35 packages/amsn/amsn.spec:1.36
--- packages/amsn/amsn.spec:1.35	Thu Feb 25 22:54:29 2010
+++ packages/amsn/amsn.spec	Thu Feb 25 23:54:55 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Klon MSN Messengera dla Linuksa
 Name:		amsn
 Version:	0.98.1
-Release:	2.3
+Release:	2.4
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/amsn/%{name}-%{version}.tar.gz
@@ -18,6 +18,8 @@
 Patch1:		%{name}-paths.patch
 Patch2:		%{name}-libpng.patch
 Patch3:		%{name}-bwidget.patch
+Patch4:		%{name}-no-exact-http.patch
+Patch5:		%{name}-songbird-exception.patch
 URL:		http://www.amsn-project.net/
 BuildRequires:	farsight2-devel
 BuildRequires:	libjpeg-devel
@@ -37,11 +39,12 @@
 # IM's convert is needed to display pictures (buddy icons).
 Requires:	ImageMagick
 Requires:	tcl >= 8.5.7
-Requires:	tcllib
-Requires:	tk-BWidget >= 1.8.0-2
 # MSN Protocol 9 won't let you in without SSL anymore.
 Requires:	tcl-tls
+Requires:	tcllib
 Requires:	tk >= 8.4
+Requires:	tk-BWidget >= 1.8.0-2
+Requires:	xdg-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		find_lang 	%{SOURCE1} %{buildroot}
@@ -105,6 +108,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # NOTE: enable debug allows us to keep debug symbols in -debuginfo package
@@ -149,7 +154,7 @@
 mv $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_desktopdir}}/%{name}.desktop
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons
-rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+rm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 # docs in docs
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/*/test.tcl
@@ -255,6 +260,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2010/02/25 22:54:55  glen
+- add -no-exact-http.patch, -songbird-exception.patch from fc; update deps
+
 Revision 1.35  2010/02/25 21:54:29  glen
 - move utils to tcl_sitearch (fc merge)
 - BR libv4l-devel, farsight2-devel

================================================================
Index: packages/amsn/amsn-no-exact-http.patch
diff -u /dev/null packages/amsn/amsn-no-exact-http.patch:1.1
--- /dev/null	Thu Feb 25 23:55:01 2010
+++ packages/amsn/amsn-no-exact-http.patch	Thu Feb 25 23:54:55 2010
@@ -0,0 +1,22 @@
+--- amsn/autoupdate.tcl	2009-11-11 09:23:42.736604374 +0100
++++ amsn~/autoupdate.tcl	2009-11-11 09:38:25.349355120 +0100
+@@ -536,7 +536,7 @@
+ 	}
+ 
+ 	#///////////////////////////////////////////////////////////////////////
+-	package require -exact http 2.4.4
++	package require http 2.4.4
+ 
+ 	proc check_web_version { token } {
+ 		global version rcversion weburl
+--- amsn/proxy.tcl	2009-11-11 09:23:43.270603596 +0100
++++ amsn~/proxy.tcl	2009-11-11 09:31:51.524364201 +0100
+@@ -9,7 +9,7 @@
+ ::Version::setSubversionId {$Id$}
+ 
+ package provide Proxy 0.1
+-package require -exact http 2.4.4
++package require http 2.4.4
+ 
+ # This should be converted to a proper package, to use with package require
+ source socks.tcl	;# SOCKS5 proxy support

================================================================
Index: packages/amsn/amsn-songbird-exception.patch
diff -u /dev/null packages/amsn/amsn-songbird-exception.patch:1.1
--- /dev/null	Thu Feb 25 23:55:01 2010
+++ packages/amsn/amsn-songbird-exception.patch	Thu Feb 25 23:54:55 2010
@@ -0,0 +1,19 @@
+--- amsn/plugins/music/infosongbird	(revision 11807)
++++ amsn/plugins/music/infosongbird	(working copy)
+@@ -1,7 +1,10 @@
+ #!/usr/bin/env python
+-import dbus
+-bus = dbus.SessionBus()
+-object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
+-print object.getStatus()
+-print object.getTitle()
+-print object.getArtist()
++try:
++	import dbus
++	bus = dbus.SessionBus()
++	object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
++	print object.getStatus()
++	print object.getTitle()
++	print object.getArtist()
++except dbus.exceptions.DBusException:
++	print "not installed"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amsn/amsn.spec?r1=1.35&r2=1.36&f=u