Author: kevin
Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19613
Modified Files:
twinkle.spec
Added Files:
twinkle-1.2-zrtpgcc43.patch
Log Message:
Rebuild with libzrtpcpp
twinkle-1.2-zrtpgcc43.patch:
--- NEW FILE twinkle-1.2-zrtpgcc43.patch ---
diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp
twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp
--- twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100
+++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp 2008-05-31 11:30:59.000000000 +1000
@@ -32,7 +32,7 @@
extern t_phone *phone;
TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) :
- ZrtpUserCallback(queue), audioSession(session)
+ ZrtpUserCallback(), audioSession(session)
{}
void TwinkleZrtpUI::secureOn(std::string cipher) {
@@ -96,7 +96,7 @@
ui->cb_async_zrtp_confirm_go_clear(lineno);
}
-void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) {
+void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message)
{
t_line *line = audioSession->get_line();
int lineno = line->get_line_number();
@@ -106,11 +106,11 @@
msg += message;
switch (sev) {
- case Info:
+ case GnuZrtpCodes::Info:
log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
LOG_INFO);
break;
- case Warning:
+ case GnuZrtpCodes::Warning:
log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
LOG_WARNING);
break;
@@ -120,7 +120,7 @@
}
}
-void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) {
+void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity,
std::string msg) {
t_line *line = audioSession->get_line();
int lineno = line->get_line_number();
@@ -130,11 +130,11 @@
m += msg;
switch (severity) {
- case Info:
+ case GnuZrtpCodes::Info:
log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed",
LOG_NORMAL,
LOG_INFO);
break;
- case Warning:
+ case GnuZrtpCodes::Warning:
log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed",
LOG_NORMAL,
LOG_WARNING);
break;
diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.h
twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h
--- twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100
+++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h 2008-05-31 11:30:20.000000000 +1000
@@ -44,8 +44,8 @@
virtual void secureOff();
virtual void showSAS(std::string sas);
virtual void confirmGoClear();
- virtual void showMessage(MessageSeverity sev, std::string message);
- virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg);
+ virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, std::string
message);
+ virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity,
std::string msg);
virtual void zrtpNotSuppOther();
private:
Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- twinkle.spec 1 Apr 2008 01:45:29 -0000 1.13
+++ twinkle.spec 30 Jun 2008 23:01:41 -0000 1.14
@@ -1,6 +1,6 @@
Name: twinkle
Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A SIP Soft Phone
Group: Applications/Internet
@@ -9,6 +9,7 @@
Source0:
http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
Patch0: twinkle-1.1-msg.patch
Patch1: twinkle-1.2-gcc43.patch
+Patch2: twinkle-1.2-zrtpgcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel
@@ -21,6 +22,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: kdelibs3-devel
BuildRequires: bison
+BuildRequires: libzrtpcpp-devel
%description
Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -29,6 +31,7 @@
%setup -q
%patch0 -p1 -b .msg
%patch1 -p1 -b .gcc43
+%patch2 -p1 -b .zrtpgcc43
%build
%configure
@@ -61,6 +64,9 @@
%{_datadir}/applications/fedora-twinkle.desktop
%changelog
+* Mon Jun 30 2008 Kevin Fenzi <kevin(a)tummy.com> - 1.2-3
+- Rebuild with libzrtpcpp
+
* Mon Mar 31 2008 Kevin Fenzi <kevin(a)tummy.com> - 1.2-2
- Rebuild for new qt3