!1 update to 2.70.0

Merge pull request !1 from orange-snn/master

libsoup-disable-hsts-tests.patch

@@ -0,0 +1,12 @@
+diff -Nur a/tests/meson.build b/tests/meson.build
+--- a/tests/meson.build	2020-03-07 10:43:35.009389900 +0800
++++ b/tests/meson.build	2020-04-14 17:01:06.516000000 +0800
+@@ -35,8 +35,6 @@
+   ['date', true, []],
+   ['forms', true, []],
+   ['header-parsing', true, []],
+-  ['hsts', true, []],
+-  ['hsts-db', true, []],
+   ['misc', true, []],
+   ['multipart', true, []],
+   ['no-ssl', true, []],

libsoup-test-utils-fix.patch

@@ -0,0 +1,30 @@
+From 3058a0ed3aaf0a54058a96f884b0a73b0cc578a8 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 11 Mar 2020 09:16:50 +0000
+Subject: [PATCH] test-utils: Clarify meaning of an environment variable
+
+SOUP_TESTS_IN_MAKE_CHECK used to be used for the Autotools build system.
+I mistakenly thought it was a way to skip the Apache-dependent tests
+during `make check`, but in fact the Autotools build system used to
+start a single instance of Apache, then run all the tests against that
+single instance, and finally shut it down.
+
+This mechanism is currently unused, but resurrecting it might be one way
+to avoid GNOME/libsoup#175.
+---
+diff -Nur a/tests/test-utils.c b/tests/test-utils.c
+--- a/tests/test-utils.c	2020-03-07 10:43:35.016056800 +0800
++++ b/tests/test-utils.c	2020-04-14 17:03:33.804000000 +0800
+@@ -189,7 +189,9 @@
+ void
+ apache_init (void)
+ {
+-	if (g_getenv ("SOUP_TESTS_IN_MAKE_CHECK"))
++        /* Set this environment variable if you are already running a
++        * suitably-configured Apache server */
++        if (g_getenv ("SOUP_TESTS_ALREADY_RUNNING_APACHE"))
+ 		return;
+ 
+ 	if (!apache_cmd ("start")) {
+-- 
+2.24.1

libsoup.spec

@@ -1,12 +1,17 @@
 Name:           libsoup
-Version:        2.66.1
+Version:        2.70.0
 Release:        1
 Summary:        An HTTP library implementation
 License:        LGPLv2
 URL:            https://wiki.gnome.org/Projects/libsoup
-Source0:        https://download.gnome.org/sources/%{name}/2.66/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/2.70/%{name}-%{version}.tar.xz
+
+Patch6000:      libsoup-disable-hsts-tests.patch
+Patch6001:      libsoup-test-utils-fix.patch
+
 BuildRequires:  glib2-devel glib-networking krb5-devel gobject-introspection-devel gettext
 BuildRequires:  libxml2-devel libpsl-devel sqlite-devel vala gtk-doc meson libxslt 
+BuildRequires:  samba-winbind-clients brotli-devel
 
 Requires:       glib2 glib-networking
 
@@ -28,12 +33,15 @@ The %{name}-devel package contains libraries and header files for %{name}.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%meson -Ddoc=true
+%meson -Dgtk_doc=true
 %meson_build
 
 %install
 %meson_install
 
+%check
+%meson_test
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS
@@ -53,8 +61,20 @@ The %{name}-devel package contains libraries and header files for %{name}.
 %files          help
 %defattr(-,root,root)
 %doc README NEWS
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc/html/libsoup-2.4/*
 
 %changelog
+* Thu Apr 16 2020 huzunhao <huzunhao2@huawei.com> - 2.70.0-1
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:update to 2.70.0
+
+* Mon Mar 16 2020 hexiujun<hexiujun1@huawei.com> - 2.66.1-2
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC:enable test
+
 * Wed Aug 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.66.1-1
 - Package init