rpms/kphone/devel kphone-4.2-configure.patch, NONE, 1.1 kphone.spec, 1.21, 1.22

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	kphone.spec 
Added Files:
	kphone-4.2-configure.patch 
Log Message:
use standard CFLAGS  reenable STUN patch


kphone-4.2-configure.patch:

--- NEW FILE kphone-4.2-configure.patch ---
--- kphone-orig/configure	2005-06-22 03:37:20.000000000 -0500
+++ kphone/configure	2006-02-05 15:12:33.000000000 -0600
@@ -1295,7 +1295,7 @@
 	echo "$ac_t""no" 1>&6
 fi
 
-CFLAGS="-I$ac_cv_qt_inc -Wall"
+CFLAGS="-I$ac_cv_qt_inc $CFLAGS"
 LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
 
 ac_ext=c
@@ -2145,13 +2145,6 @@
   enable_debug=$debug_default
 fi
 
-if test "x$enable_debug" = "xyes"; then
-         CFLAGS="$CFLAGS -g -DDEBUG"
-echo "$ac_t""yes" 1>&6
-else
-CFLAGS="$CFLAGS -O3"
-echo "$ac_t""no" 1>&6
-fi
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kphone.spec	3 Feb 2006 23:33:40 -0000	1.21
+++ kphone.spec	5 Feb 2006 21:31:14 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -13,6 +13,7 @@
 Patch2:         kphone-4.1.0-strip.patch
 Patch3:         kphone-4.2-callaudio-stun-init.patch
 Patch4:		kphone-gcc41.patch
+Patch5:		kphone-4.2-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -27,11 +28,14 @@
 %setup -q -n kphone
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun
 %patch4 -p1 -b .gcc41
+%patch5 -p1 -b .configure
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -60,6 +64,10 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sun Feb 05 2006 Dennis Gilmore <dennis at ausil.us> 4.2-6
+- patch configure  so we use standard CFLAGS  
+- reapply STUN patch 
+
 * Fri Feb 02 2006 Dennis Gilmore <dennis at ausil.us> 4.2-5
 - patch for gcc 4.1