rpms/psi/devel psi-0.12-qt-4_5-compatibility.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 psi.spec, 1.26, 1.27 sources, 1.12, 1.13

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/psi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16487

Modified Files:
	.cvsignore psi.spec sources 
Added Files:
	psi-0.12-qt-4_5-compatibility.patch 
Log Message:
- update to 0.12.1
- add qt-4.5 patch


psi-0.12-qt-4_5-compatibility.patch:

--- NEW FILE psi-0.12-qt-4_5-compatibility.patch ---
--- src/main.cpp.old	2009-02-14 21:52:12.000000000 +0500
+++ src/main.cpp	2009-02-14 21:54:42.000000000 +0500
@@ -274,9 +274,9 @@
 
 int main(int argc, char *argv[])
 {
+	PsiApplication app(argc, argv);
 	// it must be initialized first in order for ApplicationInfo::resourcesDir() to work
 	QCA::Initializer init;
-	PsiApplication app(argc, argv);
 	QApplication::addLibraryPath(ApplicationInfo::resourcesDir());
 	QApplication::addLibraryPath(ApplicationInfo::homeDir());
 	QApplication::setQuitOnLastWindowClosed(false);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Aug 2008 20:46:11 -0000	1.10
+++ .cvsignore	3 Mar 2009 22:20:25 -0000	1.11
@@ -1,4 +1 @@
-psi-0.12.tar.bz2
-emoticons-0.10.tar.gz
-psi-lang-packs-0.12.tar.gz
-rostericons-0.10.tar.gz
+psi-0.12.1.tar.bz2


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- psi.spec	1 Mar 2009 20:14:13 -0000	1.26
+++ psi.spec	3 Mar 2009 22:20:25 -0000	1.27
@@ -1,12 +1,13 @@
 Name:       psi
-Version:    0.12
-Release:    3%{?dist}
+Version:    0.12.1
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
 Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 Patch0:     psi-0.12-qca.patch
+Patch1:     psi-0.12-qt-4_5-compatibility.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,7 +69,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .qca
-
+%patch1 -p0 -b .qt45
 
 %build
 unset QTDIR
@@ -141,6 +142,10 @@
 
 
 %changelog
+* Tue Mar 03 2009 Sven Lankes <sven at lank.es> 0.12.1-1
+- Update to 0.12.1 (fix for CVE-2008-6393)
+- add patch for qt 4.5 support
+
 * Sun Mar 01 2009 Robert Scheck <robert at fedoraproject.org> 0.12-3
 - Added missing build requirement to glib2-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Aug 2008 20:46:11 -0000	1.12
+++ sources	3 Mar 2009 22:20:25 -0000	1.13
@@ -1,4 +1 @@
-47b654c944ef8766b860fe0645615d18  psi-0.12.tar.bz2
-1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-054311487f6bad8e749b6034461bb293  psi-lang-packs-0.12.tar.gz
-51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+da273e45daef04ffc8338708e96e9173  psi-0.12.1.tar.bz2