rpms/twinkle/F-12 twinkle-1.4.2-fedora-talk.patch, NONE, 1.1 twinkle.spec, 1.23, 1.24
Manuel Wolfshant
wolfy at fedoraproject.org
Sat Jul 3 21:43:53 UTC 2010
Author: wolfy
Update of /cvs/pkgs/rpms/twinkle/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7804
Modified Files:
twinkle.spec
Added Files:
twinkle-1.4.2-fedora-talk.patch
Log Message:
* Sat Jul 3 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-7
- adapt for EL-6
twinkle-1.4.2-fedora-talk.patch:
providers.csv | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE twinkle-1.4.2-fedora-talk.patch ---
diff -Nur twinkle-1.4.2.orig/data/providers.csv twinkle-1.4.2/data/providers.csv
--- twinkle-1.4.2.orig/data/providers.csv 2006-09-18 14:12:56.000000000 -0600
+++ twinkle-1.4.2/data/providers.csv 2009-11-08 19:39:16.000000000 -0700
@@ -4,3 +4,5 @@
sipgate.co.uk;sipgate.co.uk;;sipgate.co.uk
sipgate.de;sipgate.de;;sipgate.de
SIPphone!;proxy01.sipphone.com;;stun01.sipphone.com
+# fedora talk
+Fedora Talk;talk.fedoraproject.org;;
Index: twinkle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/F-12/twinkle.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- twinkle.spec 27 Jul 2009 06:24:18 -0000 1.23
+++ twinkle.spec 3 Jul 2010 21:43:53 -0000 1.24
@@ -1,6 +1,6 @@
Name: twinkle
Version: 1.4.2
-Release: 3%{?dist}
+Release: 7%{?dist}
Summary: A SIP Soft Phone
Group: Applications/Internet
@@ -8,6 +8,7 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel
@@ -20,7 +21,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: bison
BuildRequires: libzrtpcpp-devel
BuildRequires: readline-devel
-%if 0%{?fedora}
+%if 0%{?rhel} == 6 || 0%{?fedora} > 8
BuildRequires: file-devel
BuildRequires: kdelibs3-devel
%else
@@ -36,8 +37,10 @@ Twinkle is a SIP based soft phone for ma
%prep
%setup -q
%patch0 -p1 -b .msg
+%patch1 -p1 -b .ftalk
%build
+export LDFLAGS=-lkio
%configure
make %{?_smp_mflags}
@@ -77,6 +80,18 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jul 3 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-7
+- adapt for EL-6
+
+* Mon Feb 22 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.2-6
+- Add fix for DSO linking. Fixes bug #565109
+
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.4.2-5
+- rebuild (boost)
+
+* Sun Nov 23 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-4
+- Add patch for Fedora talk in the providers list - bug 530629
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list