Accepting request 667027 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/667027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nghttp2?expand=0&rev=56

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>python</package>
+</multibuild>

nghttp2-1.34.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ecb0c013141495e24bd6deca022b5a92097a7848a0c17c4e5af1243a97fa622e
-size 1612432

nghttp2-1.36.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9bb86157b88eda5a6844a232e039febbb52c1aa44b640acbbfabe729b8287fc
+size 1629020

nghttp2.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Fri Jan 18 16:42:34 UTC 2019 - seanlew@opensuse.org
+
+- Update to 1.36.0
+  * build: disable shared library if ENABLE_SHARED_LIB is off
+  * third-party: use http-parser to v2.9.0 (GH-1294)
+  * third-party: Update mruby to 2.0.0
+  * nghttpx: Pool h1 backend connection per address (GH-1292)
+  * nghttpx: Randomize backend address round robin order per thread
+    (GH-1291)
+  * nghttpx: Fix getting long SNs for openssl < 1.1 (GH-1287)
+  * h2load: add an option to write per-request logs (GH-1256)
+  * asio: added access to # of the current server port (GH-1257)
+
+-------------------------------------------------------------------
+Fri Jan 18 14:35:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Use multibuild to not pull in python3 in first build, nghttp2
+  is low in the system
+
+-------------------------------------------------------------------
+Fri Jan 11 14:24:40 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 1.35.1:
+  * nghttpx: Fix broken trailing slash handling (GH-1276)
+- Changes for version 1.35:
+  * build: cmake: Fix libevent version detection (Patch from Jan Kundrát) (GH-1238)
+  * lib: Use __has_declspec_attribute for shared builds (Patch from Don) (GH-1222)
+  * src: Require C++14 language feature
+  * nghttpx: Write mruby send_info early
+  * nghttpx: Fix assertion failure on mruby send_info with HTTP/1 frontend
+  * h2load: Handle HTTP/1 non-final response (GH-1259)
+  * h2load: Clarify that time for connect includes TLS handshake
+
 -------------------------------------------------------------------
 Mon Oct  8 19:46:51 UTC 2018 - adam.majer@suse.de
 

nghttp2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nghttp2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,8 +20,16 @@
 %define sover   14
 %define soname_asio libnghttp2_asio
 %define sover_asio 1
-Name:           nghttp2
+%global flavor @BUILD_FLAVOR@%{nil}
-Version:        1.34.0
+%if "%{flavor}" == "python"
+%define psuffix -python
+%bcond_without python
+%else
+%define psuffix %{nil}
+%bcond_with python
+%endif
+Name:           nghttp2%{psuffix}
+Version:        1.36.0
 Release:        0
 Summary:        Implementation of Hypertext Transfer Protocol version 2 in C
 License:        MIT
@@ -30,15 +38,13 @@ URL:            https://nghttp2.org/
 Source:         https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE nghttp2-remove-python-build.patch
-Patch0:         %{name}-remove-python-build.patch
+Patch0:         nghttp2-remove-python-build.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-Cython
-BuildRequires:  python3-setuptools
 BuildRequires:  pkgconfig(cunit)
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libcares)
@@ -47,8 +53,12 @@ BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(zlib)
+%if %{with python}
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  python3-Cython
+BuildRequires:  python3-setuptools
+%endif
 %ifnarch ppc %{arm}
 BuildRequires:  pkgconfig(jemalloc)
 %endif
@@ -84,11 +94,11 @@ Group:          System/Libraries
 Shared libraries for asynchronous implementation of Hypertext Transfer
 Protocol version 2.
 
-%package -n python3-%{name}
+%package -n python3-nghttp2
 Summary:        Python3 bindings for nghttp2
 Group:          Development/Libraries/Python
 
-%description -n python3-%{name}
+%description -n python3-nghttp2
 Python bindings for implementation of Hypertext Transfer Protocol version
 2.
 
@@ -120,32 +130,44 @@ Documentation for nghttp2, which includes a shared C library,
 HTTP/2 client, server and proxy.
 
 %prep
-%setup -q
+%setup -q -n nghttp2-%{version}
 %patch0 -p1
 # fix python shebang
 sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python3:g' script/fetch-ocsp-response
 
 %build
-autoreconf -fiv
+%if %{with python}
 export PYTHON=%{_bindir}/python3
+%else
+sed -i -e '/AM_PATH_PYTHON([2.7],, [:]) /d' configure.ac
+%endif
+autoreconf -fiv
 %configure \
   --disable-static        \
   --disable-silent-rules  \
   --enable-asio-lib       \
   --enable-app            \
-  --enable-python-bindings
+%if %{with python}
+  --enable-python-bindings \
+%else
+  --disable-python-bindings \
+%endif
+  %{nil}
 make %{?_smp_mflags} all
+%if %{with python}
 pushd python
 make %{?_smp_mflags} nghttp2.c
 %python3_build
 popd
+%endif
 
 %install
-%make_install
+%if %{with python}
 pushd python
 %python3_install
 popd
-
+%else
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 # Do not ship theis
@@ -154,16 +176,24 @@ rm -rf %{buildroot}%{_datadir}/doc/nghttp2
 # None of applications using these man pages are built.
 rm -rf %{buildroot}%{_mandir}/man1/* \
   doc/manual/html/.buildinfo
+%endif
 
 %check
 # One test fails if python-sphinx is not present
 make %{?_smp_mflags} check ||:
 
+%if !%{with python}
 %post -n %{soname}-%{sover} -p /sbin/ldconfig
 %post -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig
 %postun -n %{soname}-%{sover} -p /sbin/ldconfig
 %postun -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig
+%endif
 
+%if %{with python}
+%files -n python3-nghttp2
+%{python3_sitearch}/nghttp2.*.so
+%{python3_sitearch}/python_nghttp2-*
+%else
 %files
 %{_bindir}/deflatehd
 %{_bindir}/inflatehd
@@ -181,10 +211,6 @@ make %{?_smp_mflags} check ||:
 %license COPYING
 %{_libdir}/%{soname_asio}.so.%{sover_asio}*
 
-%files -n python3-%{name}
-%{python3_sitearch}/nghttp2.*.so
-%{python3_sitearch}/python_nghttp2-*
-
 %files -n %{soname}-devel
 %dir %{_includedir}/%{name}/
 %{_includedir}/%{name}/%{name}*.h
@@ -196,5 +222,6 @@ make %{?_smp_mflags} check ||:
 %{_includedir}/%{name}/asio_http2*.h
 %{_libdir}/%{soname_asio}.so
 %{_libdir}/pkgconfig/%{soname_asio}.pc
+%endif
 
 %changelog