| |
@@ -2,13 +2,13 @@
|
| |
%global with_python3 1
|
| |
|
| |
Name: python-%{pypi_name}
|
| |
- Version: 1.6.0
|
| |
- Release: 11%{?dist}
|
| |
+ Version: 1.6.6
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Shell combinators library
|
| |
|
| |
License: MIT
|
| |
URL: https://github.com/tomerfiliba/plumbum
|
| |
- Source0: http://pypi.python.org/packages/source/p/plumbum/plumbum-%{version}.tar.gz
|
| |
+ Source0: %{pypi_source}
|
| |
|
| |
BuildArch: noarch
|
| |
BuildRequires: python2-devel
|
| |
@@ -60,27 +60,27 @@
|
| |
%endif # with_python3
|
| |
|
| |
%build
|
| |
- %{__python} setup.py build
|
| |
+ %{py2_build}
|
| |
|
| |
%if 0%{?with_python3}
|
| |
pushd %{py3dir}
|
| |
- %{__python3} setup.py build
|
| |
+ %{py3_build}
|
| |
popd
|
| |
%endif # with_python3
|
| |
|
| |
%install
|
| |
%if 0%{?with_python3}
|
| |
pushd %{py3dir}
|
| |
- %{__python3} setup.py install --skip-build --root %{buildroot}
|
| |
+ %{py3_install}
|
| |
popd
|
| |
%endif # with_python3
|
| |
|
| |
- %{__python} setup.py install -O1 --skip-build --root %{buildroot}
|
| |
+ %{py2_install}
|
| |
|
| |
%files -n python2-%{pypi_name}
|
| |
%doc LICENSE README.rst
|
| |
- %{python_sitelib}/%{pypi_name}
|
| |
- %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
+ %{python2_sitelib}/%{pypi_name}
|
| |
+ %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
|
| |
%if 0%{?with_python3}
|
| |
%files -n python3-%{pypi_name}
|
| |
@@ -91,6 +91,11 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Wed Jul 25 2018 Greg Hellings <greg.hellings@gmail.com> - 1.6.6-1
|
| |
+ - Upstream version 1.6.6
|
| |
+ - Fix FTBFS BZ#1605834
|
| |
+ - Switch to standard Python macros for source URL and building
|
| |
+
|
| |
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-11
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
| |
|
| |
Also fixes FTBFS BZ#1605384