[twinkle] Fix for new libzrtpcpp

Kevin Fenzi kevin at fedoraproject.org
Mon Jan 23 17:36:51 UTC 2012 

commit 0ae1b62497d76c4e7bce2df558d07ebf0fd639da
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Jan 23 10:36:48 2012 -0700

    Fix for new libzrtpcpp
    
    - Drop Fedora talk patch

 twinkle-1.4.2-libccrtp.patch  |   88 +++++++++++++++++++++++++++++++++++++++++
 twinkle-1.4.2-localtime.patch |   12 ++++++
 twinkle.spec                  |   12 ++++-
 3 files changed, 109 insertions(+), 3 deletions(-)
---
diff --git a/twinkle-1.4.2-libccrtp.patch b/twinkle-1.4.2-libccrtp.patch
new file mode 100644
index 0000000..7664d28
--- /dev/null
+++ b/twinkle-1.4.2-libccrtp.patch
@@ -0,0 +1,88 @@
+diff -Nur twinkle-1.4.2.orig/configure twinkle-1.4.2/configure
+--- twinkle-1.4.2.orig/configure	2009-02-25 13:15:58.000000000 -0700
++++ twinkle-1.4.2/configure	2012-01-22 22:07:07.220655319 -0700
+@@ -6772,23 +6772,23 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        { echo "$as_me:$LINENO: checking for libccrtp1 >= 1.6.0" >&5
+-echo $ECHO_N "checking for libccrtp1 >= 1.6.0... $ECHO_C" >&6; }
++        { echo "$as_me:$LINENO: checking for libccrtp >= 1.6.0" >&5
++echo $ECHO_N "checking for libccrtp >= 1.6.0... $ECHO_C" >&6; }
+ 
+-        if $PKG_CONFIG --exists "libccrtp1 >= 1.6.0" ; then
++        if $PKG_CONFIG --exists "libccrtp >= 1.6.0" ; then
+             { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+             { echo "$as_me:$LINENO: checking CCRTP_CFLAGS" >&5
+ echo $ECHO_N "checking CCRTP_CFLAGS... $ECHO_C" >&6; }
+-            CCRTP_CFLAGS=`$PKG_CONFIG --cflags "libccrtp1 >= 1.6.0"`
++            CCRTP_CFLAGS=`$PKG_CONFIG --cflags "libccrtp >= 1.6.0"`
+             { echo "$as_me:$LINENO: result: $CCRTP_CFLAGS" >&5
+ echo "${ECHO_T}$CCRTP_CFLAGS" >&6; }
+ 
+             { echo "$as_me:$LINENO: checking CCRTP_LIBS" >&5
+ echo $ECHO_N "checking CCRTP_LIBS... $ECHO_C" >&6; }
+-            CCRTP_LIBS=`$PKG_CONFIG --libs "libccrtp1 >= 1.6.0"`
++            CCRTP_LIBS=`$PKG_CONFIG --libs "libccrtp >= 1.6.0"`
+             { echo "$as_me:$LINENO: result: $CCRTP_LIBS" >&5
+ echo "${ECHO_T}$CCRTP_LIBS" >&6; }
+         else
+@@ -6796,7 +6796,7 @@
+             CCRTP_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            CCRTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libccrtp1 >= 1.6.0"`
++            CCRTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libccrtp >= 1.6.0"`
+             echo $CCRTP_PKG_ERRORS
+         fi
+ 
+@@ -6811,8 +6811,8 @@
+   if test $succeeded = yes; then
+      :
+   else
+-     { { echo "$as_me:$LINENO: error: Library requirements (libccrtp1 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-echo "$as_me: error: Library requirements (libccrtp1 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++     { { echo "$as_me:$LINENO: error: Library requirements (libccrtp >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements (libccrtp >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ 
+@@ -16729,9 +16729,9 @@
+ ) | grep '^-I' | sed -e 's|^-I||' | xargs echo INCLUDEPATH += >> $QT_INCL_PRO
+ 
+ #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
+-# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
++# libccrtp(ccrtp) depend from libccgnu2(commoncpp2) and
+ # should include above flags !
+-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
++echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
+ echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
+ 
+ # get libraries specified on command line
+diff -Nur twinkle-1.4.2.orig/configure.in twinkle-1.4.2/configure.in
+--- twinkle-1.4.2.orig/configure.in	2009-02-24 12:49:20.000000000 -0700
++++ twinkle-1.4.2/configure.in	2012-01-22 22:07:07.240655323 -0700
+@@ -66,7 +66,7 @@
+ 
+ export PKG_CONFIG_PATH
+ 
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
+ 
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+@@ -134,9 +134,9 @@
+ ) | grep '^-I' | sed -e 's|^-I||' | xargs echo INCLUDEPATH += >> $QT_INCL_PRO
+ 
+ #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
+-# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
++# libccrtp(ccrtp) depend from libccgnu2(commoncpp2) and
+ # should include above flags !
+-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
++echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
+ echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
+ 
+ # get libraries specified on command line
diff --git a/twinkle-1.4.2-localtime.patch b/twinkle-1.4.2-localtime.patch
new file mode 100644
index 0000000..b00549c
--- /dev/null
+++ b/twinkle-1.4.2-localtime.patch
@@ -0,0 +1,12 @@
+diff -Nur twinkle-1.4.2.orig/src/log.cpp twinkle-1.4.2/src/log.cpp
+--- twinkle-1.4.2.orig/src/log.cpp	2009-01-18 07:35:28.000000000 -0700
++++ twinkle-1.4.2/src/log.cpp	2012-01-23 09:28:31.200768536 -0700
+@@ -161,7 +161,7 @@
+ 
+ 	gettimeofday(&t, NULL);
+ 	date = t.tv_sec;
+-	localtime_r(&date, &tm);
++	::localtime_r(&date, &tm);
+ 
+ 	*log_stream << "+++ ";
+ 	*log_stream << tm.tm_mday;
diff --git a/twinkle.spec b/twinkle.spec
index 8b172ed..775cc9e 100644
--- a/twinkle.spec
+++ b/twinkle.spec
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        1.4.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,8 +8,9 @@ License:        GPLv2+
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
-Patch1:         twinkle-1.4.2-fedora-talk.patch
+Patch1:         twinkle-1.4.2-libccrtp.patch
 Patch2:		twinkle-1.4.2-cpp.patch
+Patch3:         twinkle-1.4.2-localtime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -38,8 +39,9 @@ Twinkle is a SIP based soft phone for making telephone calls over IP networks.
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .ftalk
+%patch1 -p1 -b .ccrtp
 %patch2 -p1 -b .cpp
+%patch3 -p1 -b .localtime
 
 %build
 export LDFLAGS=-lkio 
@@ -82,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jan 23 2012 Kevin Fenzi <kevin at scrye.com> 1.4.2-16
+- Fix for new libzrtpcpp
+- Drop Fedora talk patch
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

More information about the scm-commits mailing list