Upgrade to 2.62.2

Change-Id: I8b24412aceb62f5217597e6ddf4106bac947c809

diff --cc Makefile.am
index 698b2ea,38d2872..67a5ab5
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,7 -1,7 +1,7 @@@
  ## Process this file with automake to produce Makefile.in
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
- SUBDIRS = libsoup po tests 
 -SUBDIRS = libsoup po tests examples docs win32
++SUBDIRS = libsoup po tests examples
  
  EXTRA_DIST =                          \
        data/effective_tld_names.dat    \

diff --cc configure.ac
index 1520c23,d8f2dd8..7b9451f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -172,7 -155,11 +155,12 @@@ AC_SUBST(HAVE_GNOME
  dnl ***************
  dnl *** gtk-doc ***
  dnl ***************
 +dnl GTK_DOC_CHECK([1.10])
+ # gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+ # it on it's own line.
+ m4_ifdef([GTK_DOC_CHECK], [
+ GTK_DOC_CHECK([1.20], [--flavour no-tmpl])
+ ],[])
  
  dnl *****************************
  dnl *** gobject-introspection ***

diff --cc docs/reference/Makefile.am
Simple merge

diff --cc docs/reference/libsoup-2.4-sections.txt
index ceb3213,a9b2138..81a8949
--- 1/docs/reference/libsoup-2.4-sections.txt
--- 2/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@@ -418,8 -449,10 +449,11 @@@ soup_session_sen
  soup_session_send_async
  soup_session_send_finish
  <SUBSECTION>
+ soup_session_websocket_connect_async
+ soup_session_websocket_connect_finish
+ <SUBSECTION>
  soup_session_prefetch_dns
 +soup_session_create_idle_connection
  soup_session_prepare_for_uri
  soup_session_abort
  <SUBSECTION>

diff --cc libsoup/soup-cache.c
index 13e04b9,682625e..682625e
mode 100755,100644..100755
--- 1/libsoup/soup-cache.c
--- 2/libsoup/soup-cache.c
+++ b/libsoup/soup-cache.c

diff --cc libsoup/soup-connection.c
index 441f716,5fb4d78..5fb4d78
mode 100755,100644..100755
--- 1/libsoup/soup-connection.c
--- 2/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c

diff --cc libsoup/soup-connection.h
index 4912be1,fe817de..fe817de
mode 100755,100644..100755
--- 1/libsoup/soup-connection.h
--- 2/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h

diff --cc libsoup/soup-content-sniffer.c
index 99cf47e,7573fde..7573fde
mode 100755,100644..100755
--- 1/libsoup/soup-content-sniffer.c
--- 2/libsoup/soup-content-sniffer.c
+++ b/libsoup/soup-content-sniffer.c

diff --cc libsoup/soup-content-sniffer.h
index e4c4588,eb1e4bd..eb1e4bd
mode 100755,100644..100755
--- 1/libsoup/soup-content-sniffer.h
--- 2/libsoup/soup-content-sniffer.h
+++ b/libsoup/soup-content-sniffer.h

diff --cc libsoup/soup-cookie-jar-text.c
index c4a6f1f,46e12e5..46e12e5
mode 100755,100644..100755
--- 1/libsoup/soup-cookie-jar-text.c
--- 2/libsoup/soup-cookie-jar-text.c
+++ b/libsoup/soup-cookie-jar-text.c

diff --cc libsoup/soup-cookie-jar.c
index fddf2ec,2369c8a..2369c8a
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 4b2d452,71adac7..71adac7
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 e307083,e4d7847..e4d7847
mode 100755,100644..100755
--- 1/libsoup/soup-message.c
--- 2/libsoup/soup-message.c
+++ b/libsoup/soup-message.c

diff --cc libsoup/soup-session-private.h
index ae5c549,dc4d300..dc4d300
mode 100755,100644..100755
--- 1/libsoup/soup-session-private.h
--- 2/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h

diff --cc libsoup/soup-session.c
index 3d9c3a6,ae340b9..ae340b9
mode 100755,100644..100755
--- 1/libsoup/soup-session.c
--- 2/libsoup/soup-session.c
+++ b/libsoup/soup-session.c

diff --cc libsoup/soup-session.h
index a391f7c,24e90b2..24e90b2
mode 100755,100644..100755
--- 1/libsoup/soup-session.h
--- 2/libsoup/soup-session.h
+++ b/libsoup/soup-session.h

diff --cc libsoup/soup-socket.c
index 52d88dc,311c627..311c627
mode 100755,100644..100755
--- 1/libsoup/soup-socket.c
--- 2/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c

diff --cc libsoup/soup-socket.h
index 4e5e7eb,993d1c6..993d1c6
mode 100755,100644..100755
--- 1/libsoup/soup-socket.h
--- 2/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h

diff --cc packaging/libsoup.spec
index 9aceed2,0000000..74342aa
mode 100644,000000..100644
--- 1/packaging/libsoup.spec
--- /dev/null
+++ b/packaging/libsoup.spec
@@@ -1,152 -1,0 +1,134 @@@
- Version:        2.46.0
 +%bcond_with gnome
 +%bcond_with introspection
 +
 +Name:           libsoup
- Source:         http://download.gnome.org/sources/libsoup/2.41/%{name}-%{version}.tar.xz
++Version:        2.62.2
 +Release:        1
 +License:        LGPL-2.0+
 +Summary:        HTTP client/server library for GNOME
 +Url:            http://www.gnome.org
 +Group:          System/Libraries
- BuildRequires:  pkgconfig(dlog)
++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:  python3
 +BuildRequires:  pkgconfig(glib-2.0) >= 2.35.0
 +BuildRequires:  pkgconfig(libxml-2.0)
-     --enable-sqlite=yes \
 +
 +%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
 +chmod +x autogen.sh
 +%autogen\
 +%if %{with introspection}
 +    --enable-introspection \
 +%endif
 +%if %{with gnome}
 +    --with-gnome \
 +%else
 +    --without-gnome \
- %if "{tizen_profile_name}" == "tv"
-     --enable-tizen-client-certificate=yes \
-     --enable-tizen-disable-mime-sniff \
-     --enable-tizen-text-storage-mode-of-cookie \
-     --enable-tizen-soup-cache-clean-leaked-resources \
-     --enable-tizen-tv-soup-cache-optimise-load-time \
-     --enable-tizen-use-expanded-response-block=yes \
-     --enable-tizen-create-idle-tcp-connection \
-     --enable-tizen-immediate-requesting \
-     --enable-tizen-computing-disk-cache-size \
-     --enable-tizen-add-x-soup-message-headers \
-     --enable-tizen-dynamic-certificate-loading \
-     --enable-tizen-certificate-handling \
-     --enable-tizen-tv-checking-deleted-entry-file \
-     --enable-tizen-tv-force-preload-tlsdb \
-     --enable-tizen-tv-no-cache-about-video-and-audio \
-     --enable-tizen-soup-store-dns \
- %endif
-     --disable-static
 +    --disable-tls-check \
 +%endif
++    --disable-static \
++    --enable-vala=no
 +make %{?_smp_mflags}
 +
 +%install
 +%make_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