rpms/twinkle/devel twinkle-libbind.patch, 1.1, 1.2 twinkle.spec, 1.2, 1.3

[Kevin Fenzi (kevin)]

Author: kevin

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

Modified Files:
	twinkle-libbind.patch twinkle.spec 
Log Message:
Rebuild with correct libbind patch


twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:45:39 -0000	1.2
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        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
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.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/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -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
+-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 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -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 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -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
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  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
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-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
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include <sys/wait.h>
  #include <sys/time.h>


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twinkle.spec	10 Nov 2006 16:57:35 -0000	1.2
+++ twinkle.spec	10 Nov 2006 18:45:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi <kevin at tummy.com> - 0.9-2
+- Rebuild with correct libbind patch
+
 * Fri Nov 10 2006 Kevin Fenzi <kevin at tummy.com> - 0.9-1
 - Upgrade to 0.9