diff --git a/.gitignore b/.gitignore index f3a478d..3e584a9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /copr-dist-git-0.35.tar.gz /copr-dist-git-0.36.tar.gz /copr-dist-git-0.37.tar.gz +/copr-dist-git-0.38.tar.gz diff --git a/copr-dist-git.spec b/copr-dist-git.spec index f1d0877..5ee304d 100644 --- a/copr-dist-git.spec +++ b/copr-dist-git.spec @@ -1,6 +1,6 @@ Name: copr-dist-git -Version: 0.37 -Release: 3%{?dist} +Version: 0.38 +Release: 1%{?dist} Summary: Copr services for Dist Git server Group: Applications/Productivity @@ -15,47 +15,36 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: systemd -BuildRequires: dist-git + +%if 0%{?fedora} < 28 BuildRequires: python-bunch -BuildRequires: python-requests BuildRequires: python-munch -BuildRequires: pyrpkg >= 1.47 -# check -BuildRequires: python-six -BuildRequires: python-netaddr -BuildRequires: python-dateutil -BuildRequires: pytest -BuildRequires: python-pytest-cov -BuildRequires: python-mock -%if 0%{?el7} -BuildRequires: python-psutil %else -BuildRequires: python2-psutil +BuildRequires: python2-bunch +BuildRequires: python2-munch %endif -BuildRequires: pytz - -%if 0%{?fedora} > 23 -# BuildRequires also because of build-time tests +BuildRequires: python2-requests +BuildRequires: python2-rpkg +BuildRequires: python2-six +BuildRequires: python2-pytest +BuildRequires: python2-pytest-cov +BuildRequires: python2-mock BuildRequires: python2-jinja2 + Requires: python2-jinja2 +Requires: python2-requests +Requires: python2-rpkg +%if 0%{?fedora} < 28 +Requires: python-bunch +Requires: python-munch %else -BuildRequires: python-jinja2 -Requires: python-jinja2 +Requires: python2-bunch +Requires: python2-munch %endif Requires: systemd Requires: dist-git -Requires: python-bunch -Requires: python-requests -%if 0%{?el7} -Requires: python-psutil -%else -Requires: python2-psutil -%endif -Requires: python-jinja2 -Requires: pyrpkg >= 1.47 Requires: httpd -Requires: python-munch %{?fedora:Requires(post): policycoreutils-python-utils} %{?rhel:Requires(post): policycoreutils-python} @@ -107,11 +96,8 @@ touch %{buildroot}%{_var}/log/copr-dist-git/main.log %check -%if 0%{?fedora} >= 21 -# too old `pytest` in epel repo PYTHONPATH=.:$PYTHONPATH python -B -m pytest \ -v --cov-report term-missing --cov ./dist_git ./tests/ -%endif %post # change context to be readable by cgit @@ -146,11 +132,11 @@ restorecon -rv /var/lib/copr-dist-git %ghost %{_var}/log/copr-dist-git/*.log %changelog -* Fri Feb 09 2018 Igor Gnatenko - 0.37-3 -- Escape macros in %%changelog - -* Wed Feb 07 2018 Fedora Release Engineering - 0.37-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Sun Feb 18 2018 clime 0.38-1 +- remove old conditional in spec +- fix python requires, also trim deps down +- add source_status field for Builds +- remove no longer needed CAP_SYS_CHROOT cap * Thu Sep 07 2017 clime 0.37-1 - most of the logic moved to copr-rpmbuild @@ -333,7 +319,7 @@ restorecon -rv /var/lib/copr-dist-git - [dist-git][rhbz: #1253335] Running rpkg in the dedicated process. * Wed Aug 05 2015 Valentin Gologuzov 0.5-1 -- don't run tests during %%check on epel +- don't run tests during %check on epel * Wed Aug 05 2015 Valentin Gologuzov 0.4-1 - additional BuildRequires to run tests diff --git a/sources b/sources index da51a02..72c53f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-dist-git-0.37.tar.gz) = cee831d8563bc24cd7f44f5f2f0204fa19cd0a2d83784c9e9a93e997e3e331f939b7d45f056f1327802ade883c6c3ff6f6f663b96b266c0b1fa7ec1c4c5e4ec0 +SHA512 (copr-dist-git-0.38.tar.gz) = 1a9f98a8edf919068467af2d698dabca03f44ee5bf3b72daf114c698c8705d25234ea92dcf8d6322cd8eee07ad5e540757b7a0bcbc3767b1f6bf9d5074d06d71