[packages/loudmouth] - added glib patch (fixes build with recent glib) - added link patch (avoid unnecessary linking, lik

[qboosh]

commit 21981cd007e3cade6cfe3b9a178ee8e2a846a157
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 9 21:21:25 2013 +0100

    - added glib patch (fixes build with recent glib)
    - added link patch (avoid unnecessary linking, like -lnsl)
    - updated gnutls version

 loudmouth-glib.patch | 11 +++++++++++
 loudmouth-link.patch | 15 +++++++++++++++
 loudmouth.spec       | 19 +++++++++++++------
 3 files changed, 39 insertions(+), 6 deletions(-)
---
diff --git a/loudmouth.spec b/loudmouth.spec
index a8cd05c..e7e59d5 100644
--- a/loudmouth.spec
+++ b/loudmouth.spec
@@ -8,22 +8,27 @@ Summary(pl.UTF-8):	Loudmouth - biblioteka do obsługi protokołu Jabber napisana
 Name:		loudmouth
 Version:	1.4.3
 Release:	4
-License:	LGPL
+License:	LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/loudmouth/1.4/%{name}-%{version}.tar.bz2
 # Source0-md5:	55339ca42494690c3942ee1465a96937
 Patch0:		%{name}-async_crash.patch
 Patch1:		%{name}-use-gnutls-pc.patch
-URL:		http://loudmouth.imendio.org/
+Patch2:		%{name}-glib.patch
+Patch3:		%{name}-link.patch
+URL:		https://github.com/mhallendal/loudmouth
+# not available (Nov 2013)
+#URL:		http://loudmouth.imendio.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	glib2-devel >= 1:2.12.3
-%{?with_ssl:BuildRequires:	gnutls-devel >= 1.2.5}
+%{?with_ssl:BuildRequires:	gnutls-devel >= 1.4.0}
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.7}
 BuildRequires:	libidn-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 Requires:	glib2 >= 1:2.12.3
+%{?with_ssl:Requires:	gnutls >= 1.4.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +48,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe Loudmouth, dokumentacja dla programistów
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.12.3
-%{?with_ssl:Requires:	gnutls-devel >= 1.2.5}
+%{?with_ssl:Requires:	gnutls-devel >= 1.4.0}
 
 %description devel
 This package provides the necessary header files to allow you to
@@ -67,7 +72,7 @@ Statyczna wersja bibliotek Loudmouth.
 
 %package apidocs
 Summary:	Loudmouth library API documentation
-Summary(pl.UTF-8):	Dokumentacja API biblioteki Loudmouth.
+Summary(pl.UTF-8):	Dokumentacja API biblioteki Loudmouth
 Group:		Documentation
 Requires:	gtk-doc-common
 
@@ -81,6 +86,8 @@ Dokumentacja API biblioteki Loudmouth.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -91,7 +98,7 @@ Dokumentacja API biblioteki Loudmouth.
 %configure \
 	%{!?with_ssl:--without-ssl} \
 	--with-asyncns \
-	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc
+	--enable-gtk-doc%{!?with_apidocs:=no}
 %{__make}
 
 %install
diff --git a/loudmouth-glib.patch b/loudmouth-glib.patch
new file mode 100644
index 0000000..1f5edcd
--- /dev/null
+++ b/loudmouth-glib.patch
@@ -0,0 +1,11 @@
+--- loudmouth-1.4.3/loudmouth/lm-error.c.orig	2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c	2013-11-09 15:28:12.173827631 +0100
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+ 
+ /**
diff --git a/loudmouth-link.patch b/loudmouth-link.patch
new file mode 100644
index 0000000..19ce7a7
--- /dev/null
+++ b/loudmouth-link.patch
@@ -0,0 +1,15 @@
+--- loudmouth-1.4.3/configure.ac.orig	2013-11-09 15:27:13.353830101 +0100
++++ loudmouth-1.4.3/configure.ac	2013-11-09 15:36:11.977140831 +0100
+@@ -120,9 +120,9 @@
+ dnl +--------------------------------------------------------+
+ dnl | Checking for libnsl and libsocket need on some systems |-
+ dnl +--------------------------------------------------------+
+-AC_CHECK_LIB(nsl,gethostbyname)
+-AC_CHECK_LIB(socket,socket)
+-AC_CHECK_LIB(resolv,res_query)
++AC_SEARCH_LIBS(gethostbyname,nsl)
++AC_SEARCH_LIBS(socket,socket)
++AC_SEARCH_LIBS(res_query,resolv)
+ 
+ dnl +--------------------------------------------------------+
+ dnl | Checking for SSL support                               |-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/loudmouth.git/commitdiff/21981cd007e3cade6cfe3b9a178ee8e2a846a157