diff --git a/correct-version.patch b/correct-version.patch new file mode 100644 index 0000000..6ffa759 --- /dev/null +++ b/correct-version.patch @@ -0,0 +1,10 @@ +Index: textfsm-1.1.3/textfsm/__init__.py +=================================================================== +--- textfsm-1.1.3.orig/textfsm/__init__.py ++++ textfsm-1.1.3/textfsm/__init__.py +@@ -10,4 +10,4 @@ for each input entity. + """ + from textfsm.parser import * + +-__version__ = '1.1.2' ++__version__ = '1.1.3' diff --git a/python-textfsm.changes b/python-textfsm.changes index 404eacd..7d23e2d 100644 --- a/python-textfsm.changes +++ b/python-textfsm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 5 01:14:13 UTC 2023 - Steve Kowalik + +- Add patch correct-version.patch, version in the tarball does not match. +- Add patch remove-future-requirement.patch, drop requirement of future +- Switch to pyproject and autosetup macros +- Clean up python 2 leftovers +- Do not install testdata +- Stop using greedy globs in %files + ------------------------------------------------------------------- Thu Jul 6 12:19:23 UTC 2023 - ecsos diff --git a/python-textfsm.spec b/python-textfsm.spec index 077ef83..e4a1b4e 100644 --- a/python-textfsm.spec +++ b/python-textfsm.spec @@ -1,7 +1,7 @@ # # spec file for package python-textfsm # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,26 @@ # -%define oldpython python -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?sle15_python_module_pythons} Name: python-textfsm Version: 1.1.3 Release: 0 Summary: Python module for parsing semi-structured text into python tables License: Apache-2.0 -Group: Development/Languages/Python URL: https://github.com/google/textfsm Source: https://github.com/google/textfsm/archive/v%{version}.tar.gz#/textfsm-%{version}.tar.gz -BuildRequires: %{python_module future} +# PATCH-FIX-OPENSUSE https://github.com/google/textfsm/issues/118 +Patch0: correct-version.patch +# PATCH-FIX-UPSTREAM gh#google/textfsm#116 +Patch1: remove-future-requirement.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-future Requires: python-six -%ifpython2 -Requires: python-future -%endif BuildArch: noarch %python_subpackages @@ -48,17 +46,19 @@ information returned from the command line interface (CLI) of networking devices. %prep -%setup -q -n textfsm-%{version} +%autosetup -p1 -n textfsm-%{version} # drop shebang sed -i -e '/^#!\//, 1d' textfsm/*.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install # don't install broken textfsm wrapper binary %python_expand rm -f %{buildroot}%{_bindir}/textfsm +# or the testdata +%python_expand rm -r %{buildroot}%{$python_sitelib}/testdata %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -67,6 +67,7 @@ sed -i -e '/^#!\//, 1d' textfsm/*.py %files %{python_files} %license COPYING %doc README.md -%{python_sitelib}/* +%{python_sitelib}/textfsm +%{python_sitelib}/textfsm-%{version}.dist-info %changelog diff --git a/remove-future-requirement.patch b/remove-future-requirement.patch new file mode 100644 index 0000000..845987a --- /dev/null +++ b/remove-future-requirement.patch @@ -0,0 +1,21 @@ +From b47bcfd36a753d330be0a9f4202b68dd3a549fc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?= + +Date: Mon, 14 Aug 2023 11:43:50 +0200 +Subject: [PATCH] Remove future from dependencies + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e9ff894..8fccbbb 100755 +--- a/setup.py ++++ b/setup.py +@@ -53,5 +53,5 @@ + }, + include_package_data=True, + package_data={'textfsm': ['../testdata/*']}, +- install_requires=['six', 'future'], ++ install_requires=['six'], + )