diff --git a/.gitignore b/.gitignore index 3114cc2..63bd435 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /copr-backend-1.37.tar.gz /copr-backend-1.82.tar.gz /copr-backend-1.84.tar.gz +/copr-backend-1.85.tar.gz diff --git a/copr-backend.spec b/copr-backend.spec index c01fb24..59faad9 100644 --- a/copr-backend.spec +++ b/copr-backend.spec @@ -3,7 +3,7 @@ %endif Name: copr-backend -Version: 1.84 +Version: 1.85 Release: 1%{?dist} Summary: Backend for Copr @@ -41,7 +41,6 @@ BuildRequires: python-setproctitle # missing python3 BuildRequires: python-retask BuildRequires: python-copr >= 1.60 -BuildRequires: ansible1.9 BuildRequires: python-IPy BuildRequires: python-paramiko BuildRequires: python-psutil @@ -51,12 +50,19 @@ BuildRequires: pytz # BuildRequires: python-plumbum # BuildRequires: wget -- ??? +%if 0%{?fedora} >= 24 +BuildRequires: ansible1.9 +Requires: ansible1.9 +%else +BuildRequires: ansible +Requires: ansible +%endif + #for doc package BuildRequires: sphinx BuildRequires: python-sphinx Requires: obs-signd -Requires: ansible1.9 Requires: lighttpd Requires: euca2ools Requires: rsync @@ -89,6 +95,7 @@ Requires: python-lockfile Requires: logstash Requires: libappstream-glib-builder >= 0.4.0 # Requires: python-plumbum +Requires: rpm-sign Requires(post): systemd Requires(preun): systemd @@ -247,6 +254,20 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %exclude %{_pkgdocdir}/playbooks %changelog +* Thu May 05 2016 Miroslav Suchý 1.85-1 +- also be tolerant about sign/unsign failures on particular rpm +- just log errors (exception) during particular copr fixing, do not + interrupt the whole process +- added additional check on copr path existence into copr_fix_gpg.py +- allow sudo /usr/bin/rpm for `copr` user +- look into build dirs (subdirs of a chroot) for rpms to be re-signed +- on F24+ use just ansible +- Run rpm-sign with sudo when unsigning +- script to fix gpg keys & rpm signatures +- define functions for deleting gpg signatures from packages +- removed temporary mock workaround from Dockerfile (no + longer needed) + * Thu Apr 28 2016 Miroslav Suchý 1.84-1 - Bug 1327996 - config_opts['use_host_resolv'] is not set back to True if it was False before diff --git a/sources b/sources index 9e26d75..575347a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c2918051caf39a3bcdde644bb7356fb copr-backend-1.84.tar.gz +415abbaf22c0265b143b65096d634b1d copr-backend-1.85.tar.gz