rpms/twinkle/EL-5 twinkle-1.1-msg.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 twinkle.spec, 1.6, 1.7

[Manuel Wolfshant]

Author: wolfy

Update of /cvs/pkgs/rpms/twinkle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19050

Modified Files:
	.cvsignore sources twinkle.spec 
Added Files:
	twinkle-1.1-msg.patch 
Log Message:
update to version 1.4.2


twinkle-1.1-msg.patch:

--- NEW FILE twinkle-1.1-msg.patch ---
--- twinkle-1.1/src/mwi/mwi.cpp.orig	2007-01-07 02:47:33.000000000 -0500
+++ twinkle-1.1/src/mwi/mwi.cpp	2007-12-06 09:29:31.000000000 -0500
@@ -20,7 +20,12 @@
 
 t_mwi::t_mwi() :
 	status(MWI_UNKNOWN)
-{}
+{
+	voice_msg_summary.newmsgs = 0;
+	voice_msg_summary.newmsgs_urgent = 0;
+	voice_msg_summary.oldmsgs = 0;
+	voice_msg_summary.oldmsgs_urgent = 0;
+}
 
 t_mwi::t_status t_mwi::get_status(void) const {
 	t_status result;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Aug 2007 01:20:57 -0000	1.5
+++ .cvsignore	12 Apr 2009 00:18:01 -0000	1.6
@@ -1 +1 @@
-twinkle-1.1.tar.gz
+twinkle-1.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Aug 2007 01:20:57 -0000	1.5
+++ sources	12 Apr 2009 00:18:01 -0000	1.6
@@ -1 +1 @@
-40f8341a4a82c06d00bd1b326d9c6bbf  twinkle-1.1.tar.gz
+d70c8972f296ffd998c7fb698774705b  twinkle-1.4.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twinkle/EL-5/twinkle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- twinkle.spec	9 Aug 2007 01:20:57 -0000	1.6
+++ twinkle.spec	12 Apr 2009 00:18:01 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           twinkle
-Version:        1.1
+Version:        1.4.2
 Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
@@ -7,6 +7,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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -15,16 +16,26 @@
 BuildRequires: speex-devel
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
-BuildRequires: qt-devel
-BuildRequires: bind-libbind-devel
 BuildRequires: alsa-lib-devel
+BuildRequires: bison
+BuildRequires: libzrtpcpp-devel
+BuildRequires: readline-devel
+%if 0%{?fedora}
+BuildRequires: file-devel
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: file
+BuildRequires: ncurses-devel
+BuildRequires: bind-libbind-devel
 BuildRequires: kdelibs-devel
+%endif
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
 
 %prep
 %setup -q
+%patch0 -p1 -b .msg
 
 %build
 %configure
@@ -39,7 +50,12 @@
 install -m 644 src/gui/images/twinkle48.png %{buildroot}%{_datadir}/pixmaps/twinkle.png
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/twinkle.desktop
-desktop-file-install --vendor fedora                            \
+desktop-file-install                            \
+%if 0%{?fedora}
+         --vendor fedora                        \
+%else
+         --vendor ""                            \
+%endif
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         twinkle.desktop
@@ -54,9 +70,56 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/twinkle.png
+%if 0%{?fedora}
 %{_datadir}/applications/fedora-twinkle.desktop
+%else
+%{_datadir}/applications/twinkle.desktop
+%endif
 
 %changelog
+* Wed Feb 25 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-2
+- adapt for EL-5
+
+* Wed Feb 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-1
+- Update to 1.4.2
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 02 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sun Jan 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4-1
+- Update to 1.4
+
+* Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> - 1.3.2-3
+- Rebuild for boost-1.37.0.
+
+* Tue Dec 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-2
+- Add patch to fix command line segfault (fixes #473677)
+
+* Tue Sep 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-1
+- Update to 1.3.2
+
+* Mon Jun 30 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-3
+- Rebuild with libzrtpcpp
+
+* Mon Mar 31 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-2
+- Rebuild for new qt3
+
+* Sat Mar 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-1
+- Update to 1.2
+
+* Sat Feb 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.1-5
+- Rebuild for gcc-4.3
+- Rebuild for new cctrp and commoncpp2
+
+* Tue Jan 01 2008 Kevin Fenzi <kevin at tummy.com> - 1.1-4
+- Add patch for message waiting bug (fixes #427068)
+
+* Wed Oct 10 2007 Kevin Fenzi <kevin at tummy.com> - 1.1-3
+- Rebuild for BuilID
+
 * Fri Aug 03 2007 Kevin Fenzi <kevin at tummy.com> - 1.1-2
 - Rebuild for new boost
 - Fix License tag
@@ -70,6 +133,7 @@
 * Wed Jan 24 2007 Kevin Fenzi <kevin at tummy.com> - 1.0-1
 - Update to 1.0
 - Removed unneeded patch (merged upstream)
+- Changed bind-libbind-devel BuildRequires to bind-devel
 
 * Fri Nov 10 2006 Kevin Fenzi <kevin at tummy.com> - 0.9-2
 - Rebuild with correct libbind patch