Merge tag 'upstream/2.72.0' into tizen

Change-Id: I61013c9620316590247eb1eb5377d917b17c347e

diff --cc docs/reference/libsoup-2.4-sections.txt
Simple merge

diff --cc libsoup/soup-cache.c
index 5d48024,f03999c..f03999c
mode 100755,100644..100755
--- 1/libsoup/soup-cache.c
--- 2/libsoup/soup-cache.c
+++ b/libsoup/soup-cache.c

diff --cc libsoup/soup-cookie-jar.c
index 7feaff3,c8231f0..c8231f0
mode 100755,100644..100755
--- 1/libsoup/soup-cookie-jar.c
--- 2/libsoup/soup-cookie-jar.c
+++ b/libsoup/soup-cookie-jar.c

diff --cc libsoup/soup-message-private.h
index 0c6f5d9,c30361c..c30361c
mode 100755,100644..100755
--- 1/libsoup/soup-message-private.h
--- 2/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h

diff --cc libsoup/soup-message.c
index 519972a,da32b42..da32b42
mode 100755,100644..100755
--- 1/libsoup/soup-message.c
--- 2/libsoup/soup-message.c
+++ b/libsoup/soup-message.c

diff --cc libsoup/soup-session.c
index 5dcf1eb,dd3cdc4..dd3cdc4
mode 100755,100644..100755
--- 1/libsoup/soup-session.c
--- 2/libsoup/soup-session.c
+++ b/libsoup/soup-session.c

diff --cc packaging/libsoup.spec
index 9220ea8,0000000..b26eaa4
mode 100644,000000..100644
--- 1/packaging/libsoup.spec
--- /dev/null
+++ b/packaging/libsoup.spec
@@@ -1,127 -1,0 +1,127 @@@
- Version:        2.69.90
 +%bcond_with gnome
 +%bcond_with introspection
 +
 +Name:           libsoup
++Version:        2.72.0
 +Release:        1
 +License:        LGPL-2.0+
 +Summary:        HTTP client/server library for GNOME
 +Url:            http://www.gnome.org
 +Group:          System/Libraries
 +Source:         http://download.gnome.org/sources/libsoup/2.62/%{name}-%{version}.tar.xz
 +Source99:       baselibs.conf
 +Source1001:     libsoup.manifest
 +Requires:       glib-networking
 +BuildRequires:  gettext-tools
 +BuildRequires:  glib-networking
 +%if %{with introspection}
 +BuildRequires:  gobject-introspection-devel
 +%endif
 +%if %{with gnome}
 +BuildRequires:  pkgconfig(gnome-keyring-1)
 +BuildRequires:  gnome-common
 +%endif
 +BuildRequires:  intltool >= 0.35.0
 +BuildRequires:  sqlite-devel
 +BuildRequires:  which
 +BuildRequires:        meson
 +BuildRequires:  python3
 +BuildRequires:  pkgconfig(glib-2.0) >= 2.35.0
 +BuildRequires:  pkgconfig(libxml-2.0)
 +BuildRequires:  pkgconfig(libpsl)
 +
 +%description
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +Features:
 +  * Both asynchronous (GMainLoop and callback-based) and synchronous APIs
 +  * Automatically caches connections
 +  * SSL Support using GnuTLS
 +  * Proxy support, including authentication and SSL tunneling
 +  * Client support for Digest, NTLM, and Basic authentication
 +  * Server support for Digest and Basic authentication
 +  * XML-RPC support
 +
 +%package -n typelib-Soup
 +Summary:        HTTP client/server library for GNOME -- Introspection bindings
 +Group:          System/Libraries
 +
 +%description -n typelib-Soup
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +This package provides the GObject Introspection bindings for libsoup.
 +
 +%package devel
 +Summary:        HTTP client/server library for GNOME - Development Files
 +Group:          Social & Content/GNOME
 +Requires:       %{name} = %{version}
 +%if %{with gnome}
 +Requires:       typelib-Soup = %{version}
 +%endif
 +
 +%description devel
 +Libsoup is an HTTP client/server library for GNOME. It uses GObjects
 +and the glib main loop, to integrate well with GNOME applications.
 +
 +Features:
 +  * Both asynchronous (GMainLoop and callback-based) and synchronous APIs
 +  * Automatically caches connections
 +  * SSL Support using GnuTLS
 +  * Proxy support, including authentication and SSL tunneling
 +  * Client support for Digest, NTLM, and Basic authentication
 +  * Server support for Digest and Basic authentication
 +  * XML-RPC support
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +meson --prefix /usr/ --libdir %{_libdir} build \
 +              -Dgnome=false \
 +              -Dtls_check=false
 +ninja -C build all
 +
 +%install
 +export DESTDIR=%{buildroot}
 +ninja -C build install
 +
 +%find_lang %{name}
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%lang_package
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license COPYING
 +%{_libdir}/*.so.*
 +
 +%if %{with introspection}
 +%files -n typelib-Soup
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_libdir}/girepository-1.0/Soup-2.4.typelib
 +%if %{with gnome}
 +%{_libdir}/girepository-1.0/SoupGNOME-2.4.typelib
 +%endif
 +%endif
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_includedir}/libsoup-2.4
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc
 +%if %{with introspection}
 +%{_datadir}/gir-1.0/Soup-2.4.gir
 +%if %{with gnome}
 +%{_datadir}/gir-1.0/SoupGNOME-2.4.gir
 +%{_includedir}/libsoup-gnome-2.4
 +%endif
 +%endif