Rebuild latest upstream and remove merged upstream patch

This commit is contained in:
Greg Swift 2021-06-29 14:05:44 -05:00
parent 1d6356d197
commit dd781641da
2 changed files with 8 additions and 33 deletions

View File

@ -1,27 +0,0 @@
From d93e1563add8c40450556b7d74520439ee792bd9 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
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.
---
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

View File

@ -1,11 +1,10 @@
Name: python-augeas
Version: 0.5.0
Release: 24%{?dist}
Version: 1.1.0
Release: 1%{?dist}
Summary: Python bindings to augeas
License: LGPLv2+
URL: http://augeas.net/
Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
Patch1: 0001-test-fix-discovery-of-location.patch
Source0: https://github.com/hercules-team/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python3-setuptools
@ -27,8 +26,7 @@ python3-augeas is a set of Python bindings around augeas.
%prep
%setup -q
%patch1 -p1
%autosetup -n %{name}-v%{version}
%build
%{py3_build}
@ -48,6 +46,10 @@ pytest-3
%changelog
* Tue Jun 29 2021 Greg Swift <xaeth@fedoraproject.org> - 1.1.0-1
- Rebuild latest upstream
- Remove merged upstream patch
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.5.0-24
- Rebuilt for Python 3.10