Merge tag 'upstream/1.34.0' into tizen_base

Change-Id: I05c90ec5d939e69b72c7c01ab0b467f66fab7baf

diff --cc nghttp2.manifest
index 0000000,0000000..75b0fa5
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/nghttp2.manifest
@@@ -1,0 -1,0 +1,5 @@@
++<manifest>
++    <request>
++        <domain name="_"/>
++    </request>
++</manifest>

diff --cc packaging/nghttp2.spec
index c79fbc8,0000000..a22a179
mode 100644,000000..100644
--- 1/packaging/nghttp2.spec
--- /dev/null
+++ b/packaging/nghttp2.spec
@@@ -1,61 -1,0 +1,60 @@@
- Version: 1.31.1
 +%define _unpackaged_files_terminate_build 0
 +Prefix: %{_usr}
 +Name: nghttp2
- %defattr(-,root,root,-)
++Version: 1.34.0
 +Release: 1
 +Summary: This is an experimental implementation of Hypertext Transfer Protocol version 2.
 +Group: System Environment/Libraries
 +License: MIT
 +URL: https://nghttp2.org/
 +Source0: %{name}-%{version}.tar.gz
 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +
 +BuildRequires: pkgconfig >= 0.20, zlib >= 1.2.3, gcc, gcc-c++, make
 +BuildRequires: openssl-devel
 +BuildRequires: libxml2-devel
 +
 +%description
 +
 +%package devel
 +Summary: Development files for %{name}
 +Group: Development/Libraries
 +Requires: %{name} = %{version}-%{release}
 +
 +%description devel
 +The %{name}-devel package contains libraries and header files for
 +developing applications that use %{name}.
 +
 +%prep
 +%setup -q
 +
 +%build
 +autoreconf -i
 +%{__automake}
 +%{__autoconf}
 +%configure --disable-static --disable-xmltest
 +%{__make} %{?_smp_mflags}
 +
 +%install
 +rm -rf $RPM_BUILD_ROOT
 +%{__make} install DESTDIR=$RPM_BUILD_ROOT
 +
 +%clean
 +rm -rf $RPM_BUILD_ROOT
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
- #%{_includedir}/*
++%manifest %{name}.manifest
 +%{_libdir}/*.so*
 +%exclude %{_libdir}/*.la
 +%license COPYING
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%doc /usr/share/doc/%{name}
 +%{_includedir}/*
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc