Author: kevin
Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11171/devel
Modified Files:
.cvsignore sources
Added Files:
twinkle-libbind.patch twinkle.spec
Log Message:
auto-import twinkle-0.8.1-2.fc6 on branch devel from twinkle-0.8.1-2.fc6.src.rpm
twinkle-libbind.patch:
--- NEW FILE twinkle-libbind.patch ---
diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
--- twinkle-0.8.1.orig/configure 2006-07-09 08:09:28.000000000 -0600
+++ twinkle-0.8.1/configure 2006-09-24 14:16:26.000000000 -0600
@@ -7949,10 +7949,10 @@
- echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking if res_init needs -lbind" >&5
+echo $ECHO_N "checking if res_init needs -lbind... $ECHO_C" >&6
kde_libs_safe="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+ LIBS="$LIBS $X_EXTRA_LIBS -lbind"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7998,7 +7998,7 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- LIBRESOLV="-lresolv"
+ LIBRESOLV="-lbind"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
--- twinkle-0.8.1.orig/src/gui/Makefile 2006-07-09 08:10:02.000000000 -0600
+++ twinkle-0.8.1/src/gui/Makefile 2006-09-24 16:12:14.000000000 -0600
@@ -19,7 +19,7 @@
INCPATH = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2
-I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a
../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a
../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a
../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread
-lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound
-lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a
../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a
../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a
../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread
-lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound
-lspeex -lqt-mt -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
--- twinkle-0.8.1.orig/src/gui/twinkle.pro 2006-07-07 12:44:07.000000000 -0600
+++ twinkle-0.8.1/src/gui/twinkle.pro 2006-09-24 16:12:01.000000000 -0600
@@ -3,7 +3,7 @@
CONFIG += qt warn_off release thread
-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a
../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a
../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
+LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a
../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a
../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex
DEFINES += QT_NO_STL
diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
--- twinkle-0.8.1.orig/src/Makefile.in 2006-07-09 08:09:32.000000000 -0600
+++ twinkle-0.8.1/src/Makefile.in 2006-09-24 14:24:47.000000000 -0600
@@ -338,7 +338,7 @@
$(top_builddir)/src/audits/libaudits.a\
$(top_builddir)/src/stun/libstun.a\
$(CCRTP_LIBS)\
- -lresolv\
+ -lbind\
-lsndfile\
-lboost_regex
diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
--- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp 2006-01-01 08:40:15.000000000 -0700
+++ twinkle-0.8.1/src/sockets/dnssrv.cpp 2006-09-24 16:22:12.000000000 -0600
@@ -10,7 +10,6 @@
#include <sys/wait.h>
#include <sys/time.h>
#include <netinet/in.h>
-#include <arpa/nameser.h>
#include <resolv.h>
#include <errno.h>
#include <stdlib.h>
@@ -18,6 +17,7 @@
#include <sys/socket.h>
#include <string.h>
#include <signal.h>
+#include <bind/arpa/nameser.h>
/* Common offsets into an SRV RR */
--- NEW FILE twinkle.spec ---
Name: twinkle
Version: 0.8.1
Release: 2%{?dist}
Summary: A SIP Soft Phone
Group: Applications/Internet
License: GPL
URL:
http://www.twinklephone.com
Source0:
http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
Patch0: twinkle-libbind.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel
BuildRequires: ccrtp-devel
BuildRequires: libsndfile-devel
BuildRequires: speex-devel
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: qt-devel
BuildRequires: bind-libbind-devel
BuildRequires: alsa-lib-devel
BuildRequires: kdelibs-devel
%description
Twinkle is a SIP based soft phone for making telephone calls over IP networks.
%prep
%setup -q
%patch0 -p1
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d 755 %{buildroot}%{_datadir}/pixmaps
install -m 644 src/gui/images/twinkle48.png %{buildroot}%{_datadir}/pixmaps/twinkle.png
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/twinkle.desktop
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
twinkle.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/twinkle.png
%{_datadir}/applications/fedora-twinkle.desktop
%changelog
* Sun Sep 24 2006 Kevin Fenzi <kevin(a)tummy.com> - 0.8.1-2
- Add bind-libbind-devel as a BuildRequires and link against it
to fix private glibc symbols.
- Add alsa-lib-devel and kdelibs-devel BuildRequires
* Mon Sep 18 2006 Kevin Fenzi <kevin(a)tummy.com> - 0.8.1-1
- Inital version for fedora extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Sep 2006 16:32:02 -0000 1.1
+++ .cvsignore 30 Sep 2006 16:32:40 -0000 1.2
@@ -0,0 +1 @@
+twinkle-0.8.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Sep 2006 16:32:02 -0000 1.1
+++ sources 30 Sep 2006 16:32:40 -0000 1.2
@@ -0,0 +1 @@
+245ffd3b4a6f968d8f80d42f6aad079c twinkle-0.8.1.tar.gz