diff --git a/.gitignore b/.gitignore index 141a4ac..07117ed 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ekiga-3.2.7.tar.bz2 /ekiga-3.3.0.tar.bz2 /ekiga-3.3.1.tar.bz2 /ekiga-3.3.2.tar.bz2 +/ekiga-3.9.90.tar.xz diff --git a/ekiga-gcc-4.7.patch b/ekiga-gcc-4.7.patch deleted file mode 100644 index f12c375..0000000 --- a/ekiga-gcc-4.7.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 -From: Eugen Dedu -Date: Sat, 24 Mar 2012 09:17:40 +0000 -Subject: Fix compile error with gcc 4.7 - ---- -diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h -index e16848e..b0a8775 100644 ---- a/lib/engine/account/bank-impl.h -+++ b/lib/engine/account/bank-impl.h -@@ -203,7 +203,7 @@ template - void - Ekiga::BankImpl::add_account (boost::shared_ptr account) - { -- add_object (account); -+ this->add_object (account); - - account->questions.connect (boost::ref (questions)); - } -@@ -213,7 +213,7 @@ template - void - Ekiga::BankImpl::remove_account (boost::shared_ptr account) - { -- remove_object (account); -+ this->remove_object (account); - } - - #endif -diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h -index 711d8d9..4fea7d5 100644 ---- a/lib/engine/addressbook/book-impl.h -+++ b/lib/engine/addressbook/book-impl.h -@@ -204,7 +204,7 @@ void - Ekiga::BookImpl::add_contact (boost::shared_ptr contact) - { - contact->questions.connect (boost::ref (questions)); -- add_object (contact); -+ this->add_object (contact); - } - - -@@ -212,7 +212,7 @@ template - void - Ekiga::BookImpl::remove_contact (boost::shared_ptr contact) - { -- remove_object (contact); -+ this->remove_object (contact); - } - - #endif -diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h -index a30cd03..630236f 100644 ---- a/lib/engine/addressbook/source-impl.h -+++ b/lib/engine/addressbook/source-impl.h -@@ -206,7 +206,7 @@ template - void - Ekiga::SourceImpl::add_book (boost::shared_ptr book) - { -- add_object (book); -+ this->add_object (book); - - add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); - -diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h -index 245a7c6..92074a8 100644 ---- a/lib/engine/presence/cluster-impl.h -+++ b/lib/engine/presence/cluster-impl.h -@@ -147,7 +147,7 @@ Ekiga::ClusterImpl::add_heap (boost::shared_ptr heap) - - add_connection (heap, heap->questions.connect (boost::ref (questions))); - -- add_object (heap); -+ this->add_object (heap); - } - - template -diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h -index d63c491..15fe86f 100644 ---- a/lib/engine/presence/heap-impl.h -+++ b/lib/engine/presence/heap-impl.h -@@ -160,14 +160,14 @@ Ekiga::HeapImpl::add_presentity (boost::shared_ptrquestions.connect (boost::ref (questions)); - -- add_object (presentity); -+ this->add_object (presentity); - } - - template - void - Ekiga::HeapImpl::remove_presentity (boost::shared_ptr presentity) - { -- remove_object (presentity); -+ this->remove_object (presentity); - } - - #endif --- -cgit v0.9.0.2 diff --git a/ekiga.spec b/ekiga.spec index 2d88f02..e033098 100644 --- a/ekiga.spec +++ b/ekiga.spec @@ -1,15 +1,14 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga -Version: 3.3.2 -Release: 8%{?dist} +Version: 3.9.90 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://www.ekiga.org/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.3/%{name}-%{version}.tar.bz2 -Patch0: ekiga-gcc-4.7.patch +Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.9/%{name}-%{version}.tar.bz2 -BuildRequires: ptlib-devel = 2.10.2 -BuildRequires: opal-devel = 3.10.2 +BuildRequires: ptlib-devel = 2.10.7 +BuildRequires: opal-devel = 3.10.7 BuildRequires: alsa-lib-devel BuildRequires: avahi-devel BuildRequires: avahi-glib-devel @@ -144,6 +143,10 @@ scrollkeeper-update -q || : %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Sat Aug 25 2012 Peter Robinson - 3.9.90-1 +- Ekiga 3.9.90 devel - Changelog + ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.9/ekiga-3.9.90.news + * Wed Jul 18 2012 Fedora Release Engineering - 3.3.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 9b29ffa..8f5ffdc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2db9081eb65e25c2cc226409650f42c0 ekiga-3.3.2.tar.bz2 +800be31eef542e06307691c59942595a ekiga-3.9.90.tar.xz