From 9555328c99c15e71964c7b52465c591a6569176c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Mon, 3 Nov 2025 10:07:55 +0100 Subject: [PATCH] Revert "python-zstandard package is retired on branch c10s for CS-2475" This reverts commit 2e653ad2f23335cdfa37d730a20f75885e55fac1. Resolves: RHEL-122724 --- .gitignore | 9 +++ README.md | 3 + python-zstandard-py313.patch | 12 +++ python-zstandard.spec | 151 +++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 176 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 python-zstandard-py313.patch create mode 100644 python-zstandard.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..80548f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +/zstandard-0.13.0.tar.gz +/zstandard-0.15.1.tar.gz +/zstandard-0.15.2.tar.gz +/zstandard-0.16.0.tar.gz +/zstandard-0.17.0.tar.gz +/zstandard-0.18.0.tar.gz +/zstandard-0.19.0.tar.gz +/zstandard-0.21.0.tar.gz +/zstandard-0.22.0.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..ce4d0d1 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# python-zstandard + +This project provides Python bindings for interfacing with the Zstandard compression library. A C extension and CFFI interface are provided. \ No newline at end of file diff --git a/python-zstandard-py313.patch b/python-zstandard-py313.patch new file mode 100644 index 0000000..641e646 --- /dev/null +++ b/python-zstandard-py313.patch @@ -0,0 +1,12 @@ +diff -up zstandard-0.22.0/c-ext/backend_c.c.orig zstandard-0.22.0/c-ext/backend_c.c +--- zstandard-0.22.0/c-ext/backend_c.c.orig 2023-11-01 07:04:15.000000000 +0100 ++++ zstandard-0.22.0/c-ext/backend_c.c 2023-11-22 12:51:36.452480448 +0100 +@@ -17,6 +17,8 @@ + + #include + ++#elif defined(__linux__) && defined(HAVE_UNISTD_H) ++#include + #endif + + #include "python-zstandard.h" diff --git a/python-zstandard.spec b/python-zstandard.spec new file mode 100644 index 0000000..c622afd --- /dev/null +++ b/python-zstandard.spec @@ -0,0 +1,151 @@ +%if 0%{?rhel} +%bcond_with check +%else +%bcond_without check +%endif + +%global pypi_name zstandard +%if 0%{!?pytest:1} +%global pytest %{expand:\\\ + CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\ + PATH="%{buildroot}%{_bindir}:$PATH"\\\ + PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\ + PYTHONDONTWRITEBYTECODE=1\\\ + /usr/bin/pytest} +%endif + +%global desc This project provides Python bindings for interfacing with the Zstandard\ +compression library. A C extension and CFFI interface are provided. + +Name: python-%{pypi_name} +Version: 0.22.0 +Release: 4%{?dist} +Summary: Zstandard bindings for Python +License: (BSD-3-Clause OR GPL-2.0-only) AND MIT +URL: https://github.com/indygreg/python-zstandard +Source0: %{pypi_source} +Patch0: %{name}-py313.patch + +%description +%{desc} + +%package -n python3-%{pypi_name} +Summary: %{summary} +BuildRequires: gcc +BuildRequires: libzstd-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-cffi +%if %{with check} +BuildRequires: python3-hypothesis +BuildRequires: python3-pytest +BuildRequires: python3-pytest-xdist +%endif +# https://github.com/indygreg/python-zstandard/issues/48 +Provides: bundled(zstd) = 1.5.5 + +%description -n python3-%{pypi_name} +%{desc} + +%prep +%autosetup -p1 -n %{pypi_name}-%{version} +rm -r %{pypi_name}.egg-info + +%build +%py3_build + +%install +%py3_install + +%if %{with check} +%check +mv zstandard{,.src} +export ZSTD_SLOW_TESTS=1 +%pytest -v\ + --numprocesses=auto +mv zstandard{.src,} +%endif + +%files -n python3-%{pypi_name} +%license LICENSE zstd/COPYING +%doc README.rst +%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info +%{python3_sitearch}/%{pypi_name} + +%changelog +* Mon Jun 24 2024 Troy Dawson - 0.22.0-4 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 0.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.22.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Nov 22 2023 Dominik Mierzejewski - 0.22.0-1 +- update to 0.22.0 (resolves rhbz#2247527) +- fix build with Python 3.13 (resolves rhbz#2245876) + +* Fri Jul 21 2023 Fedora Release Engineering - 0.21.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Python Maint - 0.21.0-2 +- Rebuilt for Python 3.12 + +* Wed May 24 2023 Dominik Mierzejewski - 0.21.0-1 +- update to 0.21.0 (#2172363) +- bump bundled zstd version + +* Fri Jan 20 2023 Fedora Release Engineering - 0.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 02 2022 Dominik Mierzejewski 0.19.0-1 +- update to 0.19.0 (#2138646) + +* Wed Oct 05 2022 Dominik Mierzejewski 0.18.0-1 +- update to 0.18.0 (#2099853) + +* Fri Jul 22 2022 Fedora Release Engineering - 0.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 14 2022 Python Maint - 0.17.0-2 +- Rebuilt for Python 3.11 + +* Tue Feb 15 2022 Dominik Mierzejewski 0.17.0-1 +- update to 0.17.0 (#2042593) +- drop obsolete patch + +* Fri Jan 21 2022 Fedora Release Engineering - 0.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 18 2021 Dominik Mierzejewski 0.16.0-1 +- update to 0.16.0 (#2014873) +- drop obsolete patch +- improve patch for inconsistent `closed` attribute issue + +* Tue Jul 27 2021 Fedora Release Engineering - 0.15.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.15.2-2 +- Rebuilt for Python 3.10 + +* Mon Mar 01 2021 Dominik Mierzejewski 0.15.2-1 +- update to 0.15.2 (#1933476) +- fix tests on s390x + +* Wed Feb 03 2021 Dominik Mierzejewski 0.15.1-1 +- update to 0.15.1 (#1924620) +- work around weird test failure +- fix tests on i686 and s390x + +* Wed Jan 27 2021 Fedora Release Engineering - 0.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 29 2020 Dominik Mierzejewski 0.13.0-1 +- initial build +- skip some tests on s390x (https://github.com/indygreg/python-zstandard/issues/105) + diff --git a/sources b/sources new file mode 100644 index 0000000..bc2c90f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (zstandard-0.22.0.tar.gz) = 6352586cd3eb9fd2c552a478847433a5879a4f655396186b30ec0b86325e3015c36993e4993e9fa6e92adb5118bb6f78dba1749991ec78b07a8e3646cdf414a9