[telepathy-rakia] Update to 0.7.4.
Brian Pepple
bpepple at fedoraproject.org
Thu May 10 14:18:59 UTC 2012
commit 310187f6a1616c57fd5d6503edb80b903b1bd45d
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Thu May 10 10:18:47 2012 -0400
Update to 0.7.4.
- Bump minimum version of tp-glib.
- Add patch to fix DSO linking bug.
0001-Check-for-gio-to-avoid-linking-issue.patch | 30 +++++++++++++++++++++++
telepathy-rakia.spec | 9 +++++-
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/0001-Check-for-gio-to-avoid-linking-issue.patch b/0001-Check-for-gio-to-avoid-linking-issue.patch
new file mode 100644
index 0000000..64d0780
--- /dev/null
+++ b/0001-Check-for-gio-to-avoid-linking-issue.patch
@@ -0,0 +1,30 @@
+From 62a8e7337b6d678e5293fbfe713f3d1806003331 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru at archlinux.org>
+Date: Wed, 9 May 2012 17:34:10 +0000
+Subject: [PATCH] Check for gio to avoid linking issue
+
+/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO
+/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line
+
+Signed-off-by: Ionut Biru <ibiru at archlinux.org>
+Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a6cb2a..461d464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,7 @@ dnl GTK docs
+ GTK_DOC_CHECK
+
+ dnl Check for Glib
+-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no)
++PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no)
+
+ if test x$have_glib = xno ; then
+ AC_MSG_ERROR([GLib development libraries not found])
+--
+1.7.7.6
+
diff --git a/telepathy-rakia.spec b/telepathy-rakia.spec
index 9a866bc..40cb7cd 100644
--- a/telepathy-rakia.spec
+++ b/telepathy-rakia.spec
@@ -7,6 +7,7 @@ Group: Applications/Communications
License: LGPLv2+
URL: http://telepathy.freedesktop.org/wiki/Components
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0: 0001-Check-for-gio-to-avoid-linking-issue.patch
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
@@ -19,6 +20,8 @@ BuildRequires: gtk-doc
BuildRequires: python-twisted
BuildRequires: dbus-python
BuildRequires: pygobject2
+# Drop the following once 0.7.5 is released.
+BuildRequires: autoconf
Requires: telepathy-filesystem
@@ -33,7 +36,8 @@ framework based on the SofiaSIP-stack.
%prep
%setup -q
-
+%patch0 -p1 -b .gio
+autoreconf
%build
%configure
@@ -58,9 +62,10 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}-0.7
%changelog
-* Tue May 8 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.7.4-1
+* Thu May 10 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.7.4-1
- Update to 0.7.4.
- Bump minimum version of tp-glib.
+- Add patch to fix DSO linking bug.
* Mon Jan 09 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.7.3-2
- Rebuild for new gcc.
More information about the scm-commits
mailing list