rpms/qutim/F-11 .cvsignore, 1.2, 1.3 qutim.spec, 1.1, 1.2 sources, 1.2, 1.3

[Pavel Alexeev]

Author: hubbitus

Update of /cvs/pkgs/rpms/qutim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17067

Modified Files:
	.cvsignore qutim.spec sources 
Log Message:
Add Patch0 and Patch1 first to fix annoyed QT4-webkit bug, second to add /usr/lib64/qutim in plugins
	search paths ( https://bugzilla.redhat.com/show_bug.cgi?id=494695#c32 ). Both already in upstream (I was talked
	with developer) and it is only backport to 0.2.0 version.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Dec 2009 08:26:47 -0000	1.2
+++ .cvsignore	7 Jan 2010 12:25:14 -0000	1.3
@@ -1 +1,3 @@
 qutim-0.2.0.tar.bz2
+qutim-0.2.0-WebKit_redraws.patch
+qutim-0.2.0-usr_lib64_plugin_search_path.patch


Index: qutim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/qutim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qutim.spec	21 Dec 2009 08:26:47 -0000	1.1
+++ qutim.spec	7 Jan 2010 12:25:14 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:		qutim
 Version:		0.2.0
-Release:		2%{?SVN:SVN%{SVN}}%{?dist}
+Release:		4%{?SVN:SVN%{SVN}}%{?dist}
 Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
 Summary(ru):	Мультиплатформенный, мультипротокольный (ICQ, Jabber, IRC...) мессенджер на QT4
 License:		GPLv2+ and CC-BY-SA
@@ -26,6 +26,11 @@ BuildRequires:	openssl-devel
 
 BuildRequires:	gloox-devel >= 1:1.0-1
 
+# http://gitorious.org/qutim/qutim/commit/b1983063f280b573b1dc53c97e5ae9792115868e.patch
+Patch0:		qutim-0.2.0-WebKit_redraws.patch
+# http://gitorious.org/qutim/qutim/commit/e99e718c482770e1e6c61b1c523e01f592ecb18a.patch
+Patch1:		qutim-0.2.0-usr_lib64_plugin_search_path.patch
+
 %description
 qutIM - free open-source multiprotocol ( ICQ, Jabber/GTalk/
 /Ya.Online/LiveJournal.com, Mail.Ru, IRC ) instant messenger for
@@ -171,6 +176,9 @@ Headers for %{name}
 %prep
 %setup -q
 
+%patch0 -p1 -b .webkit
+%patch1 -p1 -b .usr-lib64
+
 # Gloox is shared, do not use bundled
 rm -rf ./plugins/jabber/libs/
 
@@ -311,6 +319,11 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/cmake/Modules/qutimuic.cmake
 
 %changelog
+* Thu Jan 7 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-4
+- Add Patch0 and Patch1 first to fix annoyed QT4-webkit bug, second to add /usr/lib64/qutim in plugins
+	search paths ( https://bugzilla.redhat.com/show_bug.cgi?id=494695#c32 ). Both already in upstream (I was talked
+	with developer) and it is only backport to 0.2.0 version.
+
 * Tue Dec 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.2.0-2
 - Delete comment what qt >= 4.0 not enought and qt3-devel-0:3.3.8b-14.fc9.i386 also satisfy this, and epoch needed.
 	It outdated since Fedora 9 EOL reached.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qutim/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Dec 2009 08:26:47 -0000	1.2
+++ sources	7 Jan 2010 12:25:14 -0000	1.3
@@ -1 +1,3 @@
 a0cf5b7bc1a8fd9e0a6a712d6f1b98e7  qutim-0.2.0.tar.bz2
+2c21020782a7d3b96da066854554bf80  qutim-0.2.0-WebKit_redraws.patch
+8fba493a839c2743592573de93d908c8  qutim-0.2.0-usr_lib64_plugin_search_path.patch