!6 glib-networking升级到2.62.4

Merge pull request !6 from zhuqingfu/master

glib-networking.spec

@@ -1,19 +1,17 @@
 Name:           glib-networking
-Version:        2.58.0
-Release:        7
+Version:        2.62.4
+Release:        1
 Summary:        Network-related modules for glib
 License:        LGPLv2+
 URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/glib-networking/2.58/glib-networking-%{version}.tar.xz
-
-Patch0001: handle-new-gnutls-e-certificate-required.patch
+Source0:        http://download.gnome.org/sources/glib-networking/2.62/glib-networking-%{version}.tar.xz
 
 BuildRequires:  meson gcc ca-certificates gettext systemd gdb
-BuildRequires:  pkgconfig(glib-2.0) >= 2.55.1 pkgconfig(gnutls) >= 3.3.5
+BuildRequires:  pkgconfig(glib-2.0) >= 2.60.0 pkgconfig(gnutls)
 BuildRequires:  pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas)
-BuildRequires:  pkgconfig(libproxy-1.0) >= 0.3.1 pkgconfig(p11-kit-1) >= 0.20
+BuildRequires:  pkgconfig(libproxy-1.0) pkgconfig(p11-kit-1)
 
-Requires:       ca-certificates gsettings-desktop-schemas glib2 >= 2.55.1
+Requires:       ca-certificates gsettings-desktop-schemas glib2 >= 2.60.0
 
 %description
 glib-networking contains the implementations of certain GLib networking features
@@ -38,6 +36,9 @@ verify the Usability of the glib-networking package.
 
 %find_lang %{name}
 
+%check
+%meson_test
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc NEWS README
@@ -53,6 +54,12 @@ verify the Usability of the glib-networking package.
 %{_datadir}/installed-tests
 
 %changelog
+* Sat Jul 25 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.62.4-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:upgrade to 2.62.4
+
 * Fri Mar 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.58.0-7
 - add gdb in buildrequires
 

handle-new-gnutls-e-certificate-required.patch

@@ -1,29 +0,0 @@
-From 5f79d76fbc7f52eb677ac9b0353563043deaef71 Mon Sep 17 00:00:00 2001
-From: wangxp006 <wangxp006@163.com>
-Date: Mon, 16 Mar 2020 16:33:25 +0800
-Subject: [PATCH] handle new gnutls e certificate required
-
----
- tls/gnutls/gtlsconnection-gnutls.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
-index 959fa68..f9d43bc 100644
---- a/tls/gnutls/gtlsconnection-gnutls.c
-+++ b/tls/gnutls/gtlsconnection-gnutls.c
-@@ -1016,7 +1016,11 @@ end_gnutls_io (GTlsConnectionGnutls  *gnutls,
-       else
-         return 0;
-     }
--  else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
-+  else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND
-+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED
-+	|| status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */
-+#endif
-+	)
-     {
-       g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED,
-                            _("TLS connection peer did not send a certificate"));
--- 
-1.8.3.1
-