rpms/kphone/FC-4 kphone-4.2-configure.patch, NONE, 1.1 kphone-gcc41.patch, NONE, 1.1 kphone.spec, 1.18, 1.19
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Sun Feb 5 21:36:44 UTC 2006
- Previous message: rpms/enchant/FC-4 .cvsignore, 1.6, 1.7 enchant.spec, 1.7, 1.8 sources, 1.6, 1.7
- Next message: rpms/enchant/FC-3 .cvsignore, 1.5, 1.6 enchant.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ausil
Update of /cvs/extras/rpms/kphone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008
Modified Files:
kphone.spec
Added Files:
kphone-4.2-configure.patch kphone-gcc41.patch
Log Message:
use standard CFLAGS and renable 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.
kphone-gcc41.patch:
--- NEW FILE kphone-gcc41.patch ---
diff -Nur kphone-orig/kphone/kcallwidget.h kphone/kphone/kcallwidget.h
--- kphone-orig/kphone/kcallwidget.h 2005-04-18 08:04:40.000000000 -0500
+++ kphone/kphone/kcallwidget.h 2006-02-03 06:58:25.000000000 -0600
@@ -67,7 +67,7 @@
void clickHangup( void );
void setHide( void );
bool isHided( void ) const { return hided; }
- void KCallWidget::setDTMFSender( QString &s );
+ void setDTMFSender( QString &s );
public slots:
void pleaseDial( const SipUri &dialuri );
diff -Nur kphone-orig/kphone/kphoneview.h kphone/kphone/kphoneview.h
--- kphone-orig/kphone/kphoneview.h 2005-04-18 08:04:40.000000000 -0500
+++ kphone/kphone/kphoneview.h 2006-02-03 06:58:58.000000000 -0600
@@ -54,7 +54,7 @@
QString getStunSrv( void );
void kphoneQuit( void );
bool getState( void );
- KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype );
+ KCallWidget *DoCall( QString num, SipCall::CallType ctype );
signals:
void stateChanged( void );
Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kphone.spec 5 Aug 2005 03:35:00 -0000 1.18
+++ kphone.spec 5 Feb 2006 21:36:44 -0000 1.19
@@ -1,6 +1,6 @@
Name: kphone
Version: 4.2
-Release: 2%{?dist}
+Release: 6%{?dist}
Summary: A SIP (Session Initiation Protocol) user agent for Linux
Group: Applications/Communications
@@ -12,6 +12,8 @@
Patch1: kphone-4.1.0-endian.patch
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
@@ -26,10 +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
@@ -58,6 +64,19 @@
%{_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
+
+* Wed Dec 21 2005 Dennis Gilmore <dennis at ausil.us> 4.2-4
+-rebuild for new gcc :)
+
+* Sat Nov 12 2005 Dennis Gilmore <dennis at ausil.us> 4.2-3
+- Rebuild for updated openssl
+
* Thu Aug 04 2005 Dennis Gilmore <dennis at ausil.us> 4.2-2%{?dist}
- Remove STUN patch as it causes Segfaults on call. Will reapply when fixed.
- Previous message: rpms/enchant/FC-4 .cvsignore, 1.6, 1.7 enchant.spec, 1.7, 1.8 sources, 1.6, 1.7
- Next message: rpms/enchant/FC-3 .cvsignore, 1.5, 1.6 enchant.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list