diff --git a/.gitignore b/.gitignore index 56d542e..3bd409e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /copr-cli-1.45.tar.gz /copr-cli-1.47.tar.gz /copr-cli-1.49.tar.gz +/copr-cli-1.50.tar.gz diff --git a/copr-cli.spec b/copr-cli.spec index 4f2e5c7..e19e1fe 100644 --- a/copr-cli.spec +++ b/copr-cli.spec @@ -7,8 +7,12 @@ %endif %endif +%if 0%{?fedora} >= 24 +%global %{use_python3} +%endif + Name: copr-cli -Version: 1.49 +Version: 1.50 Release: 1%{?dist} Summary: Command line interface for COPR @@ -25,15 +29,23 @@ BuildArch: noarch BuildRequires: asciidoc BuildRequires: libxslt BuildRequires: util-linux -BuildRequires: python-setuptools +%if 0%{?use_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-copr +Requires: python3-setuptools +Requires: python3-copr >= 1.63 +%else BuildRequires: python2-devel +BuildRequires: python-setuptools BuildRequires: python-copr +Requires: python-setuptools +Requires: python-copr >= 1.63 +%endif %if 0%{?rhel} < 7 && 0%{?rhel} > 0 BuildRequires: python-argparse %endif -Requires: python-setuptools -Requires: python-copr >= 1.63 Requires: wget %if 0%{?rhel} < 7 && 0%{?rhel} > 0 Requires: python-argparse @@ -62,7 +74,14 @@ only. %build +%if 0%{?use_python3} +%{__python3} setup.py build +%else +for file in copr_cli/main.py copr_cli/__init__.py setup.py; do + sed -i 1"s|#!/usr/bin/python3 |#!/usr/bin/python |" $file +done %{__python2} setup.py build +%endif mv copr_cli/README.rst ./ @@ -71,7 +90,11 @@ a2x -d manpage -f manpage man/copr-cli.1.asciidoc %install install -d %{buildroot}%{_pkgdocdir}/ +%if 0%{?use_python3} +%{__python3} setup.py install --root %{buildroot} +%else %{__python2} setup.py install --root %{buildroot} +%endif ln -sf %{_bindir}/copr-cli %{buildroot}%{_bindir}/copr @@ -84,7 +107,11 @@ install -p man/copr.1 %{buildroot}/%{_mandir}/man1/ %license LICENSE %doc README.rst %{_bindir}/copr-cli +%if 0%{?use_python3} +%{python3_sitelib}/* +%else %{python_sitelib}/* +%endif %{_mandir}/man1/copr-cli.1* %{_mandir}/man1/copr.1* %{_bindir}/copr @@ -97,6 +124,21 @@ install -p man/copr.1 %{buildroot}/%{_mandir}/man1/ %endif %changelog +* Wed Apr 20 2016 Miroslav Suchý 1.50-1 +- use python3 on Fedora24+ +- better error message +- document --git-branch and --scm-branch options +- fix download-build for dist-git era file structure (RhBug: 1324847) +- implement building via mock +- document buildtito in manpage +- change build-tito command to buildtito +- implement building via tito +- buildpypi command documented in man pages + slightly improved + --help description of the command +- add group support for modifying and deleting projects +- fix expected warning in failing unit tests +- refactor owner name parsing + * Sun Mar 20 2016 Jakub Kadlčík 1.49-1 - allow creating group projects - bug 1309101 - copr-cli doesn't handle string input for 'status' diff --git a/sources b/sources index 37ea29c..4eb3be9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f283e7d7b8104006931c7f5e95fb8e60 copr-cli-1.49.tar.gz +2aca8e125bc060b4294a34a8b3448eee copr-cli-1.50.tar.gz