rpms/kphone/devel kphone-4.2-callaudio-stun-init.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.16, 1.17 sources, 1.3, 1.4

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8837/devel

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:04 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphone.spec	20 May 2005 05:42:04 -0000	1.16
+++ kphone.spec	23 Jul 2005 09:00:22 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-13.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 4.1.0-13
 - Patch to prevent stripping of binary (#157261)
 
 * Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:04 -0000	1.3
+++ sources	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz