[loudmouth/f17] Fix build against new glib

Daniel Drake dsd at fedoraproject.org
Wed Mar 7 16:07:24 UTC 2012


commit 7c6680f09b249e98fd1819f354da934ae26d1f96
Author: Daniel Drake <dsd at laptop.org>
Date:   Wed Mar 7 10:02:42 2012 -0600

    Fix build against new glib

 loudmouth-1.4.3-glib-compile-fix.patch |   17 +++++++++++++++++
 loudmouth.spec                         |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/loudmouth-1.4.3-glib-compile-fix.patch b/loudmouth-1.4.3-glib-compile-fix.patch
new file mode 100644
index 0000000..03d04e7
--- /dev/null
+++ b/loudmouth-1.4.3-glib-compile-fix.patch
@@ -0,0 +1,17 @@
+Fix compile against new glib.
+
+From: Daniel Drake <dsd at laptop.org>
+
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c
++++ loudmouth-1.4.3/loudmouth/lm-error.c
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+ 
+ /**
diff --git a/loudmouth.spec b/loudmouth.spec
index c43cdc1..5116eff 100644
--- a/loudmouth.spec
+++ b/loudmouth.spec
@@ -3,7 +3,7 @@
 
 Name:           loudmouth
 Version:        1.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        XMPP/Jabber C programming library
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ Patch0:		%{name}-1.4.3-certs_location.patch
 Patch1:		%{name}-1.4.3-async_assertion.patch
 Patch2:		%{name}-1.4.3-fix-sasl-md5-digest-uri.patch
 Patch3:		0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch
+Patch4:		%{name}-1.4.3-glib-compile-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
@@ -54,6 +55,7 @@ developing applications that use %{name}.
 %patch1 -p1 -b .async
 %patch2 -p1 -b .uri
 %patch3 -p1 -b .stanza
+%patch4 -p1 -b .glibincl
 
 
 %build
@@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar  7 2012 Daniel Drake <dsd at laptop.org> - 1.4.3-10
+- Fix compile against new glib
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list