| |
@@ -3,16 +3,14 @@
|
| |
|
| |
%global _docdir_fmt %{name}
|
| |
|
| |
- %if 0%{?fedora}
|
| |
- %global with_python3 1
|
| |
- %endif
|
| |
+ %global py3_prefix python%{python3_pkgversion}
|
| |
|
| |
Name: python-%{modname}
|
| |
- Version: 3.0.0
|
| |
+ Version: 3.0.1
|
| |
Release: 1%{?dist}
|
| |
Summary: Simple python library to deal with URI Templates (RFC 6570)
|
| |
|
| |
- License: BSD
|
| |
+ License: BSD or ASL 2.0
|
| |
URL: https://%{modname}.readthedocs.io
|
| |
Source0: https://github.com/sigmavirus24/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz
|
| |
|
| |
@@ -28,73 +26,59 @@
|
| |
%{?python_provide:%python_provide python2-%{altname}}
|
| |
BuildRequires: python2-devel
|
| |
BuildRequires: python2-setuptools
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
- BuildRequires: python2-pytest
|
| |
- %else
|
| |
BuildRequires: pytest
|
| |
- %endif
|
| |
|
| |
%description -n python2-%{modname}
|
| |
%{summary}.
|
| |
|
| |
Python 2 version.
|
| |
|
| |
- %if 0%{?with_python3}
|
| |
- %package -n python3-%{modname}
|
| |
+ %package -n %{py3_prefix}-%{modname}
|
| |
Summary: %{summary}
|
| |
- Conflicts: python3-uri-templates
|
| |
%{?python_provide:%python_provide python3-%{modname}}
|
| |
%{?python_provide:%python_provide python3-%{altname}}
|
| |
- BuildRequires: python3-devel
|
| |
- BuildRequires: python3-setuptools
|
| |
- BuildRequires: python3-pytest
|
| |
+ BuildRequires: %{py3_prefix}-devel
|
| |
+ BuildRequires: %{py3_prefix}-setuptools
|
| |
+ BuildRequires: %{py3_prefix}-pytest
|
| |
|
| |
- %description -n python3-%{modname}
|
| |
+ %description -n %{py3_prefix}-%{modname}
|
| |
%{summary}.
|
| |
|
| |
Python 3 version.
|
| |
- %endif
|
| |
|
| |
%prep
|
| |
%autosetup -n uritemplate-%{version}
|
| |
|
| |
%build
|
| |
%py2_build
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%py3_build
|
| |
- %endif
|
| |
|
| |
%install
|
| |
%py2_install
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%py3_install
|
| |
- %endif
|
| |
|
| |
%check
|
| |
PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
|
| |
- %endif
|
| |
|
| |
%files -n python2-%{modname}
|
| |
- %license LICENSE
|
| |
+ %license LICENSE LICENSE.APACHE LICENSE.BSD
|
| |
%doc HISTORY.rst README.rst
|
| |
%{python2_sitelib}/%{modname}-*.egg-info
|
| |
%{python2_sitelib}/%{modname}/
|
| |
|
| |
- %if 0%{?with_python3}
|
| |
- %files -n python3-%{modname}
|
| |
- %license LICENSE
|
| |
+ %files -n %{py3_prefix}-%{modname}
|
| |
+ %license LICENSE LICENSE.APACHE LICENSE.BSD
|
| |
%doc HISTORY.rst README.rst
|
| |
%{python3_sitelib}/%{modname}-*.egg-info
|
| |
%{python3_sitelib}/%{modname}/
|
| |
- %endif
|
| |
|
| |
%changelog
|
| |
+ * Sun May 03 2020 Felix Schwarz <fschwarz@fedoraproject.org> - 3.0.1-1
|
| |
+ - update to 3.0.1
|
| |
+ - declare licensing correctly and include actual license files
|
| |
+ - add Python 3 subpackage for EPEL 7 (rhbz #1829473)
|
| |
+
|
| |
* Mon Jul 31 2017 Nick Bebout <nb@fedoraproject.org> - 3.0.0-1
|
| |
- Upgrade to 3.0.0
|
| |
|
| |
fschwarz
commented 4 years ago
Mostly I just wanted to have a Python 3 subpackage so I can move certbot to Python 3 in the future (rhbz #1829473) but in the process of doing so I found a few other issues which I fixed.