[mingw-glib-networking: 8/13] Update to 2.31.16

[epienbro]

commit 7d3418b4adf5ec743e80d073c8aa57a3788e8c82
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Feb 28 12:45:30 2012 +0200

    Update to 2.31.16
    
    - Patch to fix linking against pkcs11-enabled gnutls

 .gitignore                                         |    1 +
 ...-pkcs11-Link-libgiopkcs11.la-against-glib.patch |   28 ++++++++++++++++++++
 mingw32-glib-networking.spec                       |   13 ++++++++-
 sources                                            |    2 +-
 4 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4856f5..97255c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /glib-networking-2.30.0.tar.xz
 /glib-networking-2.30.1.tar.xz
 /glib-networking-2.31.6.tar.xz
+/glib-networking-2.31.16.tar.xz
diff --git a/0001-pkcs11-Link-libgiopkcs11.la-against-glib.patch b/0001-pkcs11-Link-libgiopkcs11.la-against-glib.patch
new file mode 100644
index 0000000..ce20e7d
--- /dev/null
+++ b/0001-pkcs11-Link-libgiopkcs11.la-against-glib.patch
@@ -0,0 +1,28 @@
+From 28f8b68779095aff71798aa04adf87e693e201df Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Tue, 28 Feb 2012 12:05:46 +0200
+Subject: [PATCH] pkcs11: Link libgiopkcs11.la against glib
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670956
+---
+ tls/pkcs11/Makefile.am |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/tls/pkcs11/Makefile.am b/tls/pkcs11/Makefile.am
+index 94f3f13..bda8a78 100644
+--- a/tls/pkcs11/Makefile.am
++++ b/tls/pkcs11/Makefile.am
+@@ -15,6 +15,10 @@ libgiopkcs11_la_SOURCES =			\
+ 	pkcs11-trust-assertions.h		\
+ 	$(NULL)
+ 
++libgiopkcs11_la_LIBADD =			\
++	$(GLIB_LIBS)				\
++	$(NULL)
++
+ INCLUDES +=					\
+ 	$(PKCS11_CFLAGS)			\
+ 	-DG_DISABLE_DEPRECATED
+-- 
+1.7.9.1
+
diff --git a/mingw32-glib-networking.spec b/mingw32-glib-networking.spec
index aaaab5c..950d07a 100644
--- a/mingw32-glib-networking.spec
+++ b/mingw32-glib-networking.spec
@@ -6,7 +6,7 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw32-glib-networking
-Version:        2.31.6
+Version:        2.31.16
 Release:        1%{?dist}
 Summary:        MinGW Windows glib-networking library
 
@@ -14,6 +14,8 @@ License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gnome.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glib-networking/%{release_version}/glib-networking-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=670956
+Patch0:         0001-pkcs11-Link-libgiopkcs11.la-against-glib.patch
 
 BuildArch:      noarch
 
@@ -24,6 +26,7 @@ BuildRequires:  mingw32-glib2
 BuildRequires:  mingw32-gnutls >= 2.10
 BuildRequires:  pkgconfig
 BuildRequires:  intltool
+BuildRequires:  autoconf automake libtool
 
 %description
 This package contains modules that extend the networking support in GIO.
@@ -34,6 +37,10 @@ This package contains modules that extend the networking support in GIO.
 
 %prep
 %setup -q -n glib-networking-%{version}
+%patch0 -p1
+aclocal
+libtoolize --force
+automake
 
 
 %build
@@ -56,6 +63,10 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gio/modules/*.la
 
 
 %changelog
+* Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.31.16-1
+- Update to 2.31.16
+- Patch to fix linking against pkcs11-enabled gnutls
+
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.31.6-1
 - Update to 2.31.6
 - Dropped upstreamed patch
diff --git a/sources b/sources
index b40960e..cd762bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e589dcac78a7a7891e1b96904843cd8  glib-networking-2.31.6.tar.xz
+8d51c8dbb07a87005932086fcda45281  glib-networking-2.31.16.tar.xz