Accepting request 1079718 from devel:libraries:c_c++

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

_multibuild

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

nghttp2-1.51.0.tar.xz

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

nghttp2-remove-python-build.patch

@@ -1,21 +0,0 @@
-Index: nghttp2-1.39.1/python/Makefile.am
-===================================================================
---- nghttp2-1.39.1.orig/python/Makefile.am
-+++ nghttp2-1.39.1/python/Makefile.am
-@@ -29,16 +29,6 @@ EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CM
- 
- if ENABLE_PYTHON_BINDINGS
- 
--all-local: nghttp2.c
--	$(PYTHON) setup.py build
--
--install-exec-local:
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
--
--uninstall-local:
--	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
--	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg
--
- clean-local:
- 	$(PYTHON) setup.py clean --all
- 	-rm -f $(builddir)/nghttp2.c

nghttp2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 14 09:33:48 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.52.0:
+  * https://nghttp2.org/blog/2023/02/13/nghttp2-v1-52-0/
+  * sphinx_rtd_theme has been removed from the repository
+    and archive.
+  * The deprecated Python bindings has been removed.
+  * The deprecated libnghttp2_asio has been removed.
+  * llhttp and neverbleed have been updated.
+  * This release fixes the bug that stalls TLS connection.
+  * This release adds more http3 integration tests.
+- drop nghttp2-remove-python-build.patch: obsolete as the code got removed
+
 -------------------------------------------------------------------
 Thu Nov 17 16:35:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

nghttp2.spec

@@ -21,18 +21,11 @@
 %global soname_asio libnghttp2_asio
 %global sover_asio 1
 %global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "python"
-%define psuffix -python
-%bcond_without python
-%else
-%define psuffix %{nil}
-%bcond_with python
-%endif
 # libnghttp2_asio has been deprecated in this repository due to maintenance
 # issue and will be removed at the end of 2022
 %bcond_with asio
-Name:           nghttp2%{psuffix}
-Version:        1.51.0
+Name:           nghttp2
+Version:        1.52.0
 Release:        0
 Summary:        Implementation of Hypertext Transfer Protocol version 2 in C
 License:        MIT
@@ -40,8 +33,6 @@ Group:          Development/Libraries/C and C++
 URL:            https://nghttp2.org/
 Source:         https://github.com/nghttp2/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE nghttp2-remove-python-build.patch
-Patch0:         nghttp2-remove-python-build.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -57,11 +48,6 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
-%if %{with python}
-BuildRequires:  python3-Cython
-BuildRequires:  python3-setuptools
-BuildRequires:  pkgconfig(python3)
-%endif
 %ifnarch ppc %{arm}
 %if 0%{?sle_version} >= 150000 && 0%{?is_opensuse}
 BuildRequires:  pkgconfig(jemalloc)
@@ -136,42 +122,20 @@ HTTP/2 client, server and proxy.
 
 %prep
 %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
-%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  \
   %{?with_asio:--enable-asio-lib} %{!?with_asio: --disable-asio-lib} \
   --enable-app            \
-%if %{with python}
-  --enable-python-bindings \
-%else
-  --disable-python-bindings \
-%endif
   %{nil}
 %make_build all
-%if %{with python}
-pushd python
-%make_build nghttp2.c
-%python3_build
-popd
-%endif
 
 %install
-%if %{with python}
-pushd python
-%python3_install
-popd
-%else
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
@@ -181,26 +145,18 @@ 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_build check ||:
 
-%if !%{with python}
 %post -n %{soname}-%{sover} -p /sbin/ldconfig
 %postun -n %{soname}-%{sover} -p /sbin/ldconfig
 %if %{with asio}
 %post -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig
 %postun -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig
 %endif
-%endif
 
-%if %{with python}
-%files -n python3-nghttp2
-%{python3_sitearch}/nghttp2.*.so
-%{python3_sitearch}/python_nghttp2-*
-%else
 %files
 %{_bindir}/deflatehd
 %{_bindir}/inflatehd
@@ -231,6 +187,5 @@ rm -rf %{buildroot}%{_mandir}/man1/* \
 %{_libdir}/%{soname_asio}.so
 %{_libdir}/pkgconfig/%{soname_asio}.pc
 %endif
-%endif
 
 %changelog