diff --git a/.gitignore b/.gitignore index bff2343..af5b2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /copr-dist-git-0.18.tar.gz /copr-dist-git-0.20.tar.gz /copr-dist-git-0.23.tar.gz +/copr-dist-git-0.24.tar.gz diff --git a/copr-dist-git.spec b/copr-dist-git.spec index f58c4d2..14de441 100644 --- a/copr-dist-git.spec +++ b/copr-dist-git.spec @@ -1,5 +1,5 @@ Name: copr-dist-git -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: Copr services for Dist Git server @@ -18,7 +18,7 @@ BuildRequires: systemd BuildRequires: dist-git BuildRequires: python-bunch BuildRequires: python-requests -BuildRequires: pyrpkg +BuildRequires: pyrpkg >= 1.47 # check BuildRequires: python-six BuildRequires: python-netaddr @@ -26,7 +26,11 @@ BuildRequires: python-dateutil BuildRequires: pytest BuildRequires: python-pytest-cov BuildRequires: python-mock +%if 0%{?el7} +BuildRequires: python-psutil +%else BuildRequires: python2-psutil +%endif BuildRequires: pytz %if 0%{?fedora} > 23 @@ -42,9 +46,13 @@ 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 +Requires: pyrpkg >= 1.47 Requires: mock-scm Requires: docker Requires: httpd @@ -130,6 +138,12 @@ usermod -aG docker copr-service %ghost %{_var}/log/copr-dist-git/*.log %changelog +* Thu Jan 26 2017 clime 0.24-1 +- install mock-scm in docker image from official fedora repos +- upgrade docker image to f25 +- Fixes for building COPR Backend and Dist-git on EL7 +- fix copy hack for new internal pyrpkg API + * Thu Dec 01 2016 clime 0.23-1 - use other than epel chroot for scm building - use newest mock diff --git a/sources b/sources index b7d3bde..3e1c3b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95bf2567169e2a87b4aebb344f6a5447 copr-dist-git-0.23.tar.gz +SHA512 (copr-dist-git-0.24.tar.gz) = b6246c5f3a669353c70a1bd1fd62eb2431a7b9fc2512cd65d8dc88c49542ee4c1b694e15435e5babff72e9b4eff1b81a49d86bd5d2ab761708e84909f84f62e1