From d8be9f1f1296a6a3ad6d2de4c84457953f90f718 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 16:04:43 +0000 Subject: [PATCH] import UBI python-augeas-1.1.0-14.el10 --- .gitignore | 3 +- 0001-test-fix-discovery-of-location.patch | 29 ----- gating.yaml | 6 - python-augeas-test-package-installation.patch | 22 ++++ python-augeas.spec | 121 ++++++++++++++++-- sources | 2 +- 6 files changed, 132 insertions(+), 51 deletions(-) delete mode 100644 0001-test-fix-discovery-of-location.patch delete mode 100644 gating.yaml create mode 100644 python-augeas-test-package-installation.patch diff --git a/.gitignore b/.gitignore index 57838e2..86f3d42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/python-augeas-0.5.0.tar.gz -/python-augeas-0.5.0.tar.gz +python-augeas-1.1.0.tar.gz diff --git a/0001-test-fix-discovery-of-location.patch b/0001-test-fix-discovery-of-location.patch deleted file mode 100644 index 0753b84..0000000 --- a/0001-test-fix-discovery-of-location.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1d416bb862a4b85b85ad7a4be4ba106703d975ec Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Fri, 12 Oct 2018 12:50:18 +0200 -Subject: [PATCH] test: fix discovery of location - -Use __file__ to detect the location of the script instead of sys.argv, -so it will work also when loaded as module. - -(cherry picked from commit d93e1563add8c40450556b7d74520439ee792bd9) ---- - test/test_augeas.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_augeas.py b/test/test_augeas.py -index 10edbe6..7474841 100644 ---- a/test/test_augeas.py -+++ b/test/test_augeas.py -@@ -4,7 +4,7 @@ import unittest - import sys - import os - --__mydir = os.path.dirname(sys.argv[0]) -+__mydir = os.path.dirname(os.path.abspath(__file__)) - if not os.path.isdir(__mydir): - __mydir = os.getcwd() - --- -2.21.0 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 6985029..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/python-augeas-test-package-installation.patch b/python-augeas-test-package-installation.patch new file mode 100644 index 0000000..5bfb5cf --- /dev/null +++ b/python-augeas-test-package-installation.patch @@ -0,0 +1,22 @@ +From f74c4a8206c5a7f28836cbe3cd043bc481c5e518 Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +Date: Sun, 23 May 2021 09:54:53 -0400 +Subject: [PATCH] Ensure exclude is a tuple (#53) + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6c4265e..13b1a38 100755 +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ + author="Harald Hoyer", + author_email="augeas-devel@redhat.com", + description="""Python bindings for Augeas""", +- packages=find_packages(exclude=('test')), ++ packages=find_packages(exclude=('test',)), + setup_requires=["cffi>=1.0.0"], + cffi_modules=["augeas/ffi.py:ffi"], + install_requires=["cffi>=1.0.0"], diff --git a/python-augeas.spec b/python-augeas.spec index e42b172..edfb945 100644 --- a/python-augeas.spec +++ b/python-augeas.spec @@ -1,24 +1,27 @@ Name: python-augeas -Version: 0.5.0 -Release: 12%{?dist} +Version: 1.1.0 +Release: 14%{?dist} Summary: Python bindings to augeas -Group: Development/Languages -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://augeas.net/ -Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz -Patch1: 0001-test-fix-discovery-of-location.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: https://github.com/hercules-team/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-test-package-installation.patch BuildArch: noarch -BuildRequires: python3-setuptools python3-devel -BuildRequires: augeas python3-pytest +BuildRequires: python3-setuptools +BuildRequires: python3-devel +BuildRequires: augeas +BuildRequires: python3-pytest +BuildRequires: python3-cffi %description python-augeas is a set of Python bindings around augeas. + %package -n python3-augeas Summary: Python 3 bindings to augeas Requires: augeas-libs +Requires: python3-cffi %{?python_provide:%python_provide python3-augeas} %description -n python3-augeas @@ -26,10 +29,12 @@ python3-augeas is a set of Python bindings around augeas. %prep -%setup -q -%patch1 -p1 +%autosetup -p1 +%build %{py3_build} + +%install %{py3_install} %check @@ -39,13 +44,103 @@ pytest-3 %license COPYING %doc AUTHORS README.txt %{python3_sitelib}/augeas.py +%{python3_sitelib}/augeas/ %{python3_sitelib}/python_augeas-*.egg-info %{python3_sitelib}/__pycache__/* %changelog -* Tue May 14 2019 Pino Toscano - 0.5.0-12 -- Run the tests during the build (RHBZ#1682268). +* Tue Oct 29 2024 Troy Dawson - 1.1.0-14 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.1.0-13 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 1.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 1.1.0-9 +- Rebuilt for Python 3.12 + +* Thu Feb 23 2023 Rafael Jeffman - 1.1.0-8 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 1.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.1.0-5 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 11 2021 Felix Schwarz - 1.1.0-3 +- do not install "test" package + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 29 2021 Greg Swift - 1.1.0-1 +- Rebuild latest upstream +- Remove merged upstream patch + +* Thu Jun 03 2021 Python Maint - 0.5.0-24 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.5.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.5.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 0.5.0-21 +- Rebuilt for Python 3.9 + +* Thu Apr 02 2020 Pino Toscano - 0.5.0-20 +- Backport upstream commit d93e1563add8c40450556b7d74520439ee792bd9 to fix + the discovery of location in the test +- Execute the tests at build time +- Add a simple gating test to execute the test script, and make it gating for + the python-augeas source + +* Thu Jan 30 2020 Fedora Release Engineering - 0.5.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 28 2019 Miro Hrončok - 0.5.0-18 +- Subpackage python2-augeas has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Thu Oct 03 2019 Miro Hrončok - 0.5.0-17 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 16 2019 Miro Hrončok - 0.5.0-16 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.5.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.5.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Jun 16 2018 Miro Hrončok - 0.5.0-12 +- Rebuilt for Python 3.7 + +* Wed Feb 14 2018 Iryna Shcherbina - 0.5.0-11 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) * Fri Feb 09 2018 Fedora Release Engineering - 0.5.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index a3e3370..5227a1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-augeas-0.5.0.tar.gz) = d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51 +SHA512 (python-augeas-1.1.0.tar.gz) = ad5b283b98c0b5ce078098689ffa814628f23d412c450937b87c4ac12df2f60a1df9df1d83399eee47b85b40afd2919300158ecfa4b7c1a9a39fe73583ed3d0c