commit d7959d00bc7e8d9c58006df7d0e3b5cd63527909
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 23 20:56:01 2020 +0200
- switched to maintained mcabber fork, updated tl 1.5.3
- updated link patch
- removed outdated async_crash,use-gnutls-pc,glib,gnutls patches
- drop .la file
loudmouth-async_crash.patch | 19 -------------
loudmouth-glib.patch | 11 --------
loudmouth-gnutls.patch | 22 ---------------
loudmouth-link.patch | 14 ++++-----
loudmouth-use-gnutls-pc.patch | 12 --------
loudmouth.spec | 66 +++++++++++++++++++++++--------------------
6 files changed, 42 insertions(+), 102 deletions(-)
---
diff --git a/loudmouth.spec b/loudmouth.spec
index eb1dfc0..48f6957 100644
--- a/loudmouth.spec
+++ b/loudmouth.spec
@@ -1,35 +1,41 @@
#
# Conditional build:
%bcond_without apidocs # disable gtk-doc
-%bcond_without ssl # without SSL support
+%bcond_without asyncns # libasyncns support
+%bcond_without ssl # SSL support
+%bcond_with openssl # OpenSSL instead of GnuTLS for SSL
+%if %{with ssl} && %{without openssl}
+%define with_gnutls 1
+%endif
+%if %{without ssl}
+%undefine with_openssl
+%endif
Summary: Loudmouth - a Jabber library written in C
Summary(pl.UTF-8): Loudmouth - biblioteka do obsługi protokołu Jabber
napisana w C
Name: loudmouth
-Version: 1.4.3
-Release: 9
+Version: 1.5.3
+Release: 1
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
-Patch2: %{name}-glib.patch
-Patch3: %{name}-link.patch
-Patch4: %{name}-gnutls.patch
-URL: https://github.com/mhallendal/loudmouth
-# not available (Nov 2013)
-#URL: http://loudmouth.imendio.org/
-BuildRequires: autoconf >= 2.59
+Source0: https://mcabber.com/files/loudmouth/%{name}-%{version}.tar.bz2
+# Source0-md5: 0db0ce1c5a57f81b5736be8bd2217a82
+Patch0: %{name}-link.patch
+URL: https://github.com/mcabber/loudmouth/
+BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
-BuildRequires: glib2-devel >= 1:2.12.3
-%{?with_ssl:BuildRequires: gnutls-devel >= 1.4.0}
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.7}
+BuildRequires: glib2-devel >= 1:2.12.4
+%{?with_gnutls:BuildRequires: gnutls-devel >= 3.0.20}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.14}
+BuildRequires: heimdal-devel
+%{?with_asyncns:BuildRequires: libasyncns-devel >= 0.3}
BuildRequires: libidn-devel
BuildRequires: libtool
+%{?with_openssl:BuildRequires: openssl-devel}
BuildRequires: pkgconfig
-Requires: glib2 >= 1:2.12.3
-%{?with_ssl:Requires: gnutls >= 1.4.0}
+Requires: glib2 >= 1:2.12.4
+%{?with_gnutls:Requires: gnutls >= 3.0.20}
+%{?with_asyncns:Requires: libasyncns >= 0.3}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -48,8 +54,9 @@ Summary: Header files and development documentation for
Loudmouth library
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.4.0}
+Requires: glib2-devel >= 1:2.12.4
+%{?with_asyncns:Requires: libasyncns-devel >= 0.3}
+Requires: libidn-devel
%description devel
This package provides the necessary header files to allow you to
@@ -76,7 +83,7 @@ Summary: Loudmouth library API documentation
Summary(pl.UTF-8): Dokumentacja API biblioteki Loudmouth
Group: Documentation
Requires: gtk-doc-common
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
BuildArch: noarch
%endif
@@ -89,10 +96,6 @@ Dokumentacja API biblioteki Loudmouth.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%{__gtkdocize}
@@ -102,8 +105,9 @@ Dokumentacja API biblioteki Loudmouth.
%{__autoheader}
%{__automake}
%configure \
+ %{?with_asyncns:--with-asyncns} \
%{!?with_ssl:--without-ssl} \
- --with-asyncns \
+ %{?with_openssl:--with-ssl=openssl} \
--enable-gtk-doc%{!?with_apidocs:=no}
%{__make}
@@ -114,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
HTML_DIR=%{_gtkdocdir}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libloudmouth-1.la
+
%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
%clean
@@ -124,14 +131,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ChangeLog NEWS README
+%doc AUTHORS NEWS README
%attr(755,root,root) %{_libdir}/libloudmouth-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libloudmouth-1.so.0
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libloudmouth-1.so
-%{_libdir}/libloudmouth-1.la
%{_pkgconfigdir}/loudmouth-1.0.pc
%{_includedir}/loudmouth-1.0
@@ -142,5 +148,5 @@ rm -rf $RPM_BUILD_ROOT
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}
+%{_gtkdocdir}/loudmouth
%endif
diff --git a/loudmouth-async_crash.patch b/loudmouth-async_crash.patch
deleted file mode 100644
index bda1d19..0000000
--- a/loudmouth-async_crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urp loudmouth-1.4.3.OLD/loudmouth/lm-socket.c
loudmouth-1.4.3/loudmouth/lm-socket.c
---- loudmouth-1.4.3.OLD/loudmouth/lm-socket.c 2008-10-29 12:29:16.000000000
-0400
-+++ loudmouth-1.4.3/loudmouth/lm-socket.c 2008-11-28 19:24:04.000000000
-0500
-@@ -1107,6 +1107,7 @@ lm_socket_create (GMainContext *con
- _lm_socket_create_phase1 (socket, NULL, 0);
- }
-
-+#ifndef HAVE_ASYNCNS
- if (socket->connect_data == NULL) {
- /* Open failed synchronously, probably a DNS lookup problem */
- lm_socket_unref(socket);
-@@ -1118,6 +1119,7 @@ lm_socket_create (GMainContext *con
-
- return NULL;
- }
-+#endif
-
-
- /* If the connection fails synchronously, we don't want to call the
diff --git a/loudmouth-glib.patch b/loudmouth-glib.patch
deleted file mode 100644
index 1f5edcd..0000000
--- a/loudmouth-glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-gnutls.patch b/loudmouth-gnutls.patch
deleted file mode 100644
index 47c86e0..0000000
--- a/loudmouth-gnutls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Taken from loudmonth 1.5.x development (https://github.com/mcabber/loudmouth/)
---- loudmouth-1.4.3/loudmouth/lm-ssl-gnutls.c.orig 2008-10-29
14:45:10.000000000 +0100
-+++ loudmouth-1.4.3/loudmouth/lm-ssl-gnutls.c 2017-03-10 22:10:49.140876292
+0100
-@@ -196,17 +196,9 @@
- {
- int ret;
- gboolean auth_ok = TRUE;
-- const int cert_type_priority[] =
-- { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
-- const int compression_priority[] =
-- { GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 };
-
- gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT);
-- gnutls_set_default_priority (ssl->gnutls_session);
-- gnutls_certificate_type_set_priority (ssl->gnutls_session,
-- cert_type_priority);
-- gnutls_compression_set_priority (ssl->gnutls_session,
-- compression_priority);
-+ gnutls_priority_set_direct (ssl->gnutls_session, "NORMAL", NULL);
- gnutls_credentials_set (ssl->gnutls_session,
- GNUTLS_CRD_CERTIFICATE,
- ssl->gnutls_xcred);
diff --git a/loudmouth-link.patch b/loudmouth-link.patch
index 19ce7a7..6cbe635 100644
--- a/loudmouth-link.patch
+++ b/loudmouth-link.patch
@@ -1,15 +1,13 @@
---- 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 @@
+--- loudmouth-1.5.3/configure.ac.orig 2020-07-23 08:30:36.526003498 +0200
++++ loudmouth-1.5.3/configure.ac 2020-07-23 17:57:09.491847803 +0200
+@@ -141,8 +141,8 @@
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(gethostbyname, nsl)
+AC_SEARCH_LIBS(socket,socket)
-+AC_SEARCH_LIBS(res_query,resolv)
+ AC_CHECK_LIB(resolv,__res_query)
+ AC_CHECK_LIB(resolv,res_query)
- dnl +--------------------------------------------------------+
- dnl | Checking for SSL support |-
diff --git a/loudmouth-use-gnutls-pc.patch b/loudmouth-use-gnutls-pc.patch
deleted file mode 100644
index b524cc3..0000000
--- a/loudmouth-use-gnutls-pc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN loudmouth-1.4.3/configure.ac loudmouth-1.4.3.new/configure.ac
---- loudmouth-1.4.3/configure.ac 2008-10-29 21:23:52.000000000 +0100
-+++ loudmouth-1.4.3.new/configure.ac 2009-10-24 14:59:47.623887421 +0200
-@@ -146,7 +146,7 @@
- enable_ssl=no
- if test "x$ac_ssl" = "xgnutls"; then
- dnl Look for GnuTLS
-- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes,
have_libgnutls=no)
-+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= $GNUTLS_REQUIRED,
have_libgnutls=yes, have_libgnutls=no)
- if test "x$have_libgnutls" = "xyes"; then
- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/loudmouth.git/commitdiff/d7959d00bc7e8d9c58006df7d0e3b5cd63527909
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
