X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=twinkle.spec;h=f2d8d90788a4b9ab0f2797087beb21195841b030;hb=7efbe1a1f402a6f62c3f3e88d3f4077ed96918c6;hp=dd573a397d3902d69a23d0a2429cbe5d4e287e3a;hpb=bebd0d01c07f6b59916a0f2ebd5b80a33c151e15;p=packages%2Ftwinkle.git

diff --git a/twinkle.spec b/twinkle.spec
index dd573a3..f2d8d90 100644
--- a/twinkle.spec
+++ b/twinkle.spec
@@ -1,36 +1,40 @@
 #
 # Conditional build:
-%bcond_without	kde		# disable KDE support
+%bcond_with	kde		# disable KDE support
 #
 Summary:	twinkle - SIP Soft Phone
 Summary(pl.UTF-8):	twinkle - telefon programowy SIP
 Name:		twinkle
-Version:	1.2
-Release:	1
+Version:	1.4.2
+Release:	11
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-# Source0-md5:	bd83f658ec0d1f59750b7464ea1e2318
+# Source0-md5:	d70c8972f296ffd998c7fb698774705b
 Source1:	%{name}.desktop
 Patch0:		%{name}-nobind.patch
+Patch1:		%{name}-build.patch
+Patch2:		%{name}-ucommon.patch
 URL:		http://www.twinklephone.com/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.35.0
-BuildRequires:	ccrtp-devel >= 1.5.0
-BuildRequires:	commoncpp2-devel >= 1.5.0
+BuildRequires:	ccrtp-devel >= 1.7.1
+BuildRequires:	commoncpp2-devel >= 1.7.1
 %{?with_kde:BuildRequires:	kdelibs-devel}
 BuildRequires:	libgsm-devel >= 1.0.11
 BuildRequires:	libilbc-devel
+BuildRequires:	libmagic-devel
 BuildRequires:	libsndfile-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
-BuildRequires:	libzrtpcpp-devel
+BuildRequires:	libzrtpcpp-devel >= 1.4.3
 BuildRequires:	pkgconfig
 BuildRequires:	qmake
 BuildRequires:	qt-devel >= 6:3.3.0
 BuildRequires:	qt-linguist
+BuildRequires:	readline-devel
 BuildRequires:	speex-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,6 +49,8 @@ telefonicznych po sieciach IP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %{__libtoolize}