packages: psi/psi-machekku-avatars_in_tooltip.patch, psi/psi.spec - up to 0.14

[arekm]

Author: arekm                        Date: Thu Dec  3 11:48:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.14

---- Files affected:
packages/psi:
   psi-machekku-avatars_in_tooltip.patch (1.1 -> 1.2) , psi.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: packages/psi/psi-machekku-avatars_in_tooltip.patch
diff -u packages/psi/psi-machekku-avatars_in_tooltip.patch:1.1 packages/psi/psi-machekku-avatars_in_tooltip.patch:1.2
--- packages/psi/psi-machekku-avatars_in_tooltip.patch:1.1	Sun Aug 10 14:33:16 2008
+++ packages/psi/psi-machekku-avatars_in_tooltip.patch	Thu Dec  3 12:48:37 2009
@@ -71,7 +71,7 @@
 -		setData(icon, contactText);
 +		setData(&avatar, icon, contactText);
  	else if ( d->popupType == AlertHeadline ) {
- 		QVBoxLayout *vbox = new QVBoxLayout(0);
+ 		QVBoxLayout *vbox = new QVBoxLayout;
 -		vbox->addLayout( d->createContactInfo(icon, contactText) );
 +		vbox->addLayout( d->createContactInfo(&avatar, icon, contactText) );
  

================================================================
Index: packages/psi/psi.spec
diff -u packages/psi/psi.spec:1.175 packages/psi/psi.spec:1.176
--- packages/psi/psi.spec:1.175	Tue Aug 18 00:54:19 2009
+++ packages/psi/psi.spec	Thu Dec  3 12:48:37 2009
@@ -3,12 +3,12 @@
 Summary(de.UTF-8):	PSI - ein Instant Messaging Client-Programm für Jabber
 Summary(pl.UTF-8):	PSI - klient Jabbera
 Name:		psi
-Version:	0.13
-Release:	4
+Version:	0.14
+Release:	1
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
-# Source0-md5:	ddc1a2a35dc155ca46ad6ecaeccdf894
+# Source0-md5:	9d7dcce3bcab53b741a712199bd986be
 Source1:	%{name}-lang.tar.bz2
 # Source1-md5:	cf6d82f53f1f1600a49bb61ba81151bf
 Patch0:		%{name}-fix_configure_for_ksh.patch
@@ -24,6 +24,7 @@
 URL:		http://psi-im.org/
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel
+BuildRequires:	QtDBus-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtXml-devel
 BuildRequires:	aspell-devel
@@ -70,7 +71,8 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+# functionality (partially) merged?
+# %patch7 -p1
 %patch8 -p1
 
 rm -rf third-party
@@ -81,7 +83,6 @@
 	--datadir=%{_datadir} \
 	--libdir=%{_libdir}
 
-qmake-qt4
 %{__make}
 
 cd lang
@@ -144,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2009/12/03 11:48:37  arekm
+- up to 0.14
+
 Revision 1.175  2009/08/17 22:54:19  cactus
 - add langs from psi-daisy
 - rel 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi-machekku-avatars_in_tooltip.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi.spec?r1=1.175&r2=1.176&f=u