rpms/kdenetwork/F-8 kdenetwork-3.5.9-kopete-icq.patch, NONE, 1.1 kdenetwork.spec, 1.116, 1.117

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/F-8

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.9-kopete-icq.patch 
Log Message:
* Tue Jul 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.9-3
- kde#165502: ICQ doesn't connect (Client to old)

kdenetwork-3.5.9-kopete-icq.patch:

--- NEW FILE kdenetwork-3.5.9-kopete-icq.patch ---
diff -Naur kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp
--- kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp	2008-02-14 01:11:52.000000000 +0100
+++ kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp	2008-07-01 20:06:00.000000000 +0200
@@ -89,13 +89,13 @@
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
 	KConfigGroup config( KGlobal::config(), "ICQVersion" );
 	
-	mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" );
+	mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" );
 	mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 );
-	mICQVersion.major = config.readEntry( "Major", "0x0014" ).toUShort( 0, 0 );
-	mICQVersion.minor = config.readEntry( "Minor", "0x0034" ).toUShort( 0, 0 );
+	mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 0 );
+	mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 0 );
 	mICQVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 );
-	mICQVersion.build = config.readEntry( "Build", "0x0BB8" ).toUShort( 0, 0 );
-	mICQVersion.other = config.readEntry( "Other", "0x0000043D" ).toUInt( 0, 0 );
+	mICQVersion.build = config.readEntry( "Build", "0x17AB" ).toUShort( 0, 0 );
+	mICQVersion.other = config.readEntry( "Other", "0x00007535" ).toUInt( 0, 0 );
 	mICQVersion.country = config.readEntry( "Country", "us" );
 	mICQVersion.lang = config.readEntry( "Lang", "en" );
 }


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-8/kdenetwork.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdenetwork.spec	26 Feb 2008 13:37:07 -0000	1.116
+++ kdenetwork.spec	1 Jul 2008 21:22:32 -0000	1.117
@@ -24,7 +24,7 @@
 Name:    kdenetwork
 Epoch:   7
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Network Applications
 
 License: GPLv2
@@ -48,6 +48,10 @@
 Patch5: kdenetwork-3.5.9-ppp.patch
 Patch6: kdenetwork-3.5.9-krfb_httpd.patch
 
+# fix kde#165502: ICQ doesn't connect (Client to old)
+# use the same ICQ version number as Kopete from KDE 4
+Patch100: kdenetwork-3.5.9-kopete-icq.patch
+
 %if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
@@ -172,6 +176,8 @@
 %patch5 -p1 -b .ppp
 %patch6 -p1 -b .krfb_httpd
 
+%patch100 -p1 -b .kopete-icq
+
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -473,6 +479,9 @@
 
 
 %changelog
+* Tue Jul 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 7:3.5.9-3
+- kde#165502: ICQ doesn't connect (Client to old)
+
 * Tue Feb 26 2008 Lukáš Tinkl <ltinkl at redhat.com> - 7:3.5.9-2
 - #433511: vnc server through krfb and accessing by http broken
 - #433510: /usr/bin/krfb_httpd broken due to converted literal ^M chars