diff --git a/python-pytz.changes b/python-pytz.changes index 09ac28b..a31eb78 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 31 21:53:27 UTC 2024 - Matej Cepl + +- Clean up SPEC file. + ------------------------------------------------------------------- Fri May 31 11:52:05 UTC 2024 - Antonio Larrosa diff --git a/python-pytz.spec b/python-pytz.spec index 431a1a6..a1cdda0 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -19,15 +19,6 @@ # Ensure you update the tzdata_version for any minor version increase # otherwise the update python library has the incorrect timezone data. %define tzdata_version 2024a -%define oldpython python -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%{?!pyunittest:%define pyunittest(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) \\\ - %{lua: local args = rpm.expand("%**"); - local broot = rpm.expand("%buildroot"); - local intro = "%{python_expand PYTHONPATH=${PYTHONPATH:+$PYTHONPATH:}" .. broot .. "%{$python_sitelib} PYTHONDONTWRITEBYTECODE=1 $python -m unittest "; - print(rpm.expand(intro .. args .. "}")) - } } - %{?sle15_python_module_pythons} Name: python-pytz Version: 2024.1 @@ -41,17 +32,15 @@ Source: https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{ver Patch0: fix-tests.patch # PATCH-FIX-UPSTREAM 0001-Fix-tests-for-older-timezone-versions.patch -- https://code.launchpad.net/~toabctl/pytz/+git/pytz/+merge/326419 Patch2: 0001-Fix-tests-for-older-timezone-versions.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: timezone >= %{tzdata_version} Requires: python-base Requires: timezone >= %{tzdata_version} BuildArch: noarch -%ifpython2 -Provides: %{oldpython}-tz = %{version} -Obsoletes: %{oldpython}-tz < %{version} -%endif %python_subpackages %description @@ -75,10 +64,10 @@ sed -i '/^#!/d' ./pytz/tzfile.py touch pytz/tests/__init__.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install # Replace custom data with symlink to /usr/share/zoneinfo %{python_expand rm -r %{buildroot}%{$python_sitelib}/pytz/zoneinfo ln -s %{_datadir}/zoneinfo %{buildroot}%{$python_sitelib}/pytz/zoneinfo @@ -97,6 +86,6 @@ fi || : %license LICENSE.txt %doc README.rst %{python_sitelib}/pytz -%{python_sitelib}/pytz-%{version}-py*.egg-info +%{python_sitelib}/pytz-%{version}*-info %changelog