commit 6ec3f4ecd48724e23e1dbd425d9d7912bf50cb2b Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu Mar 21 21:45:04 2019 +0100
- updated to 1.6.1; supports click 7 python-PyGitUp.spec | 121 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 87 insertions(+), 34 deletions(-) --- diff --git a/python-PyGitUp.spec b/python-PyGitUp.spec index 2ca0aed..f4f608e 100644 --- a/python-PyGitUp.spec +++ b/python-PyGitUp.spec @@ -1,71 +1,124 @@ # # Conditional build: -%bcond_with tests # do not perform "make test" +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module +%bcond_without tests # unit tests %define module PyGitUp -Summary: git-up(1) -- fetch and rebase all locally-tracked remote branches +Summary: git-up(1) - fetch and rebase all locally-tracked remote branches +Summary(pl.UTF-8): git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych gałęzi Name: python-%{module} -Version: 1.6.0 +Version: 1.6.1 Release: 1 -License: BSD +License: MIT Group: Libraries/Python +#Source0Download: https://github.com/msiemens/PyGitUp/releases Source0: https://github.com/msiemens/PyGitUp/archive/v%{version}/%{module}-v%{version}.tar.gz -# Source0-md5: f86f0b91e13defeddee38b9cb7b64b44 +# Source0-md5: 8573a0c48aa0afa6dddae51d1cd204c1 URL: https://github.com/msiemens/PyGitUp -BuildRequires: rpm-pythonprov -# if py_postclean is used -BuildRequires: rpmbuild(macros) >= 1.710 -BuildRequires: python-git >= 2.1.8 -BuildRequires: python-async +%if %{with python2} +BuildRequires: python-modules >= 1:2.7 +BuildRequires: python-setuptools +%if %{with tests} +BuildRequires: python-click >= 7.0 BuildRequires: python-colorama >= 0.3.7 -BuildRequires: python-click >= 6.0.0 -BuildRequires: python-distribute -BuildRequires: python-gitdb -BuildRequires: python-nose +BuildRequires: python-git >= 2.1.8 +BuildRequires: python-nose >= 1.3.7 BuildRequires: python-six >= 1.10.0 -BuildRequires: python-smmap BuildRequires: python-termcolor >= 1.1.0 -Requires: python-git >= 2.1.8 -Requires: python-async -Requires: python-colorama >= 0.3.7 -Requires: python-click >= 6.0.0 -Requires: python-gitdb -Requires: python-modules -Requires: python-nose -Requires: python-smmap -Requires: python-six >= 1.10.0 -Requires: python-termcolor >= 1.1.0 +%endif +%endif +%if %{with python3} +BuildRequires: python3-modules >= 1:3.4 +BuildRequires: python3-setuptools +%if %{with tests} +BuildRequires: python3-click >= 7.0 +BuildRequires: python3-colorama >= 0.3.7 +BuildRequires: python3-git >= 2.1.8 +BuildRequires: python3-nose >= 1.3.7 +BuildRequires: python3-six >= 1.10.0 +BuildRequires: python3-termcolor >= 1.1.0 +%endif +%endif +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.714 +Requires: python-modules >= 1:2.7 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -git-up(1) -- fetch and rebase all locally-tracked remote branches. +git-up(1) - fetch and rebase all locally-tracked remote branches. + +%description -l pl.UTF-8 +git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych +gałęzi. + +%package -n python3-%{module} +Summary: git-up(1) - fetch and rebase all locally-tracked remote branches +Summary(pl.UTF-8): git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych gałęzi +Group: Libraries/Python +Requires: python3-modules >= 1:3.4 + +%description -n python3-%{module} +git-up(1) - fetch and rebase all locally-tracked remote branches. + +%description -n python3-%{module} -l pl.UTF-8 +git-up(1) - pobieranie i rebase wszystkich śledzonych lokalnie zdanych +gałęzi. %prep %setup -q -n %{module}-%{version} %build +%if %{with python2} %py_build %{?with_tests:test} +%endif + +%if %{with python3} +%py3_build %{?with_tests:test} +%endif %install rm -rf $RPM_BUILD_ROOT +%if %{with python3} +%py3_install + +%{__mv} $RPM_BUILD_ROOT%{_bindir}/git-up{,-3} + +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/PyGitUp/tests +%endif + +%if %{with python2} %py_install %py_postclean +%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/PyGitUp/tests +%endif + %clean rm -rf $RPM_BUILD_ROOT +%if %{with python2} %files %defattr(644,root,root,755) -%doc README.rst +%doc LICENCE README.rst %attr(755,root,root) %{_bindir}/git-up -%dir %{py_sitescriptdir}/%{module} -%{py_sitescriptdir}/%{module}/*.py[co] -%dir %{py_sitescriptdir}/%{module}/tests -%{py_sitescriptdir}/%{module}/tests/*.py[co] -%{py_sitescriptdir}/%{module}/check-bundler.rb -%if "%{py_ver}" > "2.4" -%{py_sitescriptdir}/git_up-*.egg-info +%dir %{py_sitescriptdir}/PyGitUp +%{py_sitescriptdir}/PyGitUp/*.py[co] +%{py_sitescriptdir}/PyGitUp/check-bundler.rb +%{py_sitescriptdir}/git_up-%{version}-py*.egg-info +%endif + +%if %{with python3} +%files -n python3-%{module} +%defattr(644,root,root,755) +%doc LICENCE README.rst +%attr(755,root,root) %{_bindir}/git-up-3 +%dir %{py3_sitescriptdir}/PyGitUp +%{py3_sitescriptdir}/PyGitUp/*.py +%{py3_sitescriptdir}/PyGitUp/__pycache__ +%{py3_sitescriptdir}/PyGitUp/check-bundler.rb +%{py3_sitescriptdir}/git_up-%{version}-py*.egg-info %endif ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-PyGitUp.git/commitdiff/6ec3f4ecd48724e23e1dbd425d9d7912bf50cb2b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit