| |
@@ -1,8 +1,8 @@
|
| |
%global pkgname cliapp
|
| |
|
| |
Name: python-%{pkgname}
|
| |
- Version: 1.20160724
|
| |
- Release: 6%{?dist}
|
| |
+ Version: 1.20180121
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Python framework for Unix command line programs
|
| |
|
| |
License: GPLv2+
|
| |
@@ -11,6 +11,9 @@
|
| |
|
| |
BuildArch: noarch
|
| |
|
| |
+ # doc has been withdrawn by upstream since version 1.20170820
|
| |
+ Obsoletes: python-cliapp-doc < 1.20170820
|
| |
+
|
| |
%global _description\
|
| |
cliapp is a Python framework for Unix-like command line programs. It\
|
| |
contains the typical stuff such programs need to do, such as parsing\
|
| |
@@ -23,48 +26,61 @@
|
| |
BuildRequires: python2-devel
|
| |
BuildRequires: python2-pyyaml
|
| |
BuildRequires: python2-coverage-test-runner
|
| |
- BuildRequires: python-pep8
|
| |
+ BuildRequires: python2-pep8
|
| |
Requires: python2-pyyaml
|
| |
%{?python_provide:%python_provide python2-%{pkgname}}
|
| |
|
| |
%description -n python2-%{pkgname} %_description
|
| |
|
| |
- %package doc
|
| |
- Summary: Documentation for %{pkgname}
|
| |
- BuildRequires: python2-sphinx
|
| |
+ %package -n python3-%{pkgname}
|
| |
+ Summary: %summary
|
| |
+ BuildRequires: python3-devel
|
| |
+ BuildRequires: python3-PyYAML
|
| |
+ BuildRequires: python3-coverage-test-runner
|
| |
+ BuildRequires: python3-pep8
|
| |
+ Requires: python3-PyYAML
|
| |
+ %{?python_provide:%python_provide python3-%{pkgname}}
|
| |
+
|
| |
+ %description -n python3-%{pkgname} %_description
|
| |
|
| |
- %description doc
|
| |
- This package contains the documentation for %{pkgname}, a Python
|
| |
- framework for Unix command line programs.
|
| |
|
| |
%prep
|
| |
- %autosetup -p1
|
| |
+ %autosetup
|
| |
|
| |
%build
|
| |
%py2_build
|
| |
- # Build documentation
|
| |
- make
|
| |
+ %py3_build
|
| |
|
| |
%install
|
| |
%py2_install
|
| |
+ %py3_install
|
| |
|
| |
%check
|
| |
# CoverageTestRunner trips up on build directory;
|
| |
# since we've already done the install phase, remove it first
|
| |
rm -rf build
|
| |
- make check
|
| |
+ # Explicit Python 2 version name
|
| |
+ sed -i '5s/python -m/python2 -m/' ./check
|
| |
+ ./check
|
| |
|
| |
%files -n python2-%{pkgname}
|
| |
%doc NEWS README
|
| |
%license COPYING
|
| |
- %{_mandir}/man5/cliapp.5*
|
| |
%{python2_sitelib}/%{pkgname}
|
| |
%{python2_sitelib}/%{pkgname}-*.egg-info
|
| |
|
| |
- %files doc
|
| |
- %doc doc/_build/html/*
|
| |
+ %files -n python3-%{pkgname}
|
| |
+ %doc NEWS README
|
| |
+ %license COPYING
|
| |
+ %{_mandir}/man5/cliapp.5*
|
| |
+ %{python3_sitelib}/%{pkgname}
|
| |
+ %{python3_sitelib}/%{pkgname}-*.egg-info
|
| |
|
| |
%changelog
|
| |
+ * Wed Jan 31 2018 Jan Beran <jberan@redhat.com> - 1.20180121-1
|
| |
+ - New version including Python 3 subpackage
|
| |
+ - doc has been withdrawn by upstream since version 1.20170820
|
| |
+
|
| |
* Fri Aug 25 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.20160724-6
|
| |
- Reference more packages with python2 prefix
|
| |
|
| |
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1359556
Depends on: https://src.fedoraproject.org/rpms/python-coverage-test-runner/pull-request/2