From ec8d8c9dc8abdfcdceebc0624740f9a2d836497d Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 15:33:24 +0000 Subject: [PATCH 1/6] EL7 Support for Copr-mocks --- diff --git a/mocks/copr-mocks.spec b/mocks/copr-mocks.spec index 98ba47d..460a37b 100644 --- a/mocks/copr-mocks.spec +++ b/mocks/copr-mocks.spec @@ -11,11 +11,18 @@ Source0: %{name}-%{version}.tar.gz License: GPLv2+ BuildArch: noarch +%if 0%{?el7} +BuildRequires: python-devel +Requires: python +Requires: python-flask +Requires: python-flask-script +%else BuildRequires: python3-devel -BuildRequires: systemd-units Requires: python3 Requires: python3-flask Requires: python3-flask-script +%endif +BuildRequires: systemd-units %description This package provides mocks for individual copr system components @@ -49,6 +56,9 @@ useradd -r -g copr-mocks -G copr-mocks -d %{_datadir}/copr/mocks -s /bin/bash -c %{_unitdir}/copr-mocks-frontend.service %changelog +* Mon Dec 05 2016 Martin Juhl 1.6-2 +- EL7 Support + * Thu Dec 01 2016 clime 1.6-1 - ignore ValueError exception From c9b2f643c96554de0f5854a7037a4012722f71a2 Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 15:37:58 +0000 Subject: [PATCH 2/6] EL7 Support for Copr-backend --- diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec index 9c1f7f1..31cfaab 100644 --- a/backend/copr-backend.spec +++ b/backend/copr-backend.spec @@ -93,7 +93,10 @@ Requires: python-paramiko Requires: python-lockfile Requires: python2-modulemd # Requires: python-ipdb +# EL7 doesn't support "Suggests" +%if 0%{?fedora} Suggests: logstash +%endif Requires: libappstream-glib-builder >= 0.4.0 # Requires: python-plumbum Requires: rpm-sign From c93a013888309f7635060e61d66e1f0ec069bd33 Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 16:04:04 +0000 Subject: [PATCH 3/6] EL7 Support misc --- diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec index f58c4d2..0f1fbbb 100644 --- a/dist-git/copr-dist-git.spec +++ b/dist-git/copr-dist-git.spec @@ -1,6 +1,6 @@ Name: copr-dist-git Version: 0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Copr services for Dist Git server Group: Applications/Productivity @@ -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 @@ -130,6 +134,9 @@ usermod -aG docker copr-service %ghost %{_var}/log/copr-dist-git/*.log %changelog +* Mon Dec 05 2016 Martin Juhl 0.23-2 +- EL7 Support + * Thu Dec 01 2016 clime 0.23-1 - use other than epel chroot for scm building - use newest mock From 457465d83ca4da8ea81bee6d08bd2e75adb261c8 Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 16:05:08 +0000 Subject: [PATCH 4/6] EL7 Support misc --- diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec index 31cfaab..8190329 100644 --- a/backend/copr-backend.spec +++ b/backend/copr-backend.spec @@ -4,7 +4,7 @@ Name: copr-backend Version: 1.95 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backend for Copr Group: Applications/Productivity @@ -262,6 +262,9 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %exclude %{_pkgdocdir}/playbooks %changelog +* Mon Dec 05 2016 Martin Juhl 1.95-2 +- EL7 Support + * Thu Dec 01 2016 clime 1.95-1 - use buildroot_pkgs substitution type according to job.chroot - use timeout command to respect timeout param coming from frontend From 2562fc59516154813d1a1da82daaf32516b584e0 Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 16:22:15 +0000 Subject: [PATCH 5/6] EL7 Support --- diff --git a/mocks/copr-mocks.spec b/mocks/copr-mocks.spec index 460a37b..60487ed 100644 --- a/mocks/copr-mocks.spec +++ b/mocks/copr-mocks.spec @@ -1,7 +1,7 @@ Summary: COPR system components mocks Name: copr-mocks Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} # Source is created by: # git clone https://git.fedorahosted.org/git/copr.git From f29038c647bdc3ba4d04a6be3367871f6bafe3dd Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Dec 05 2016 16:23:15 +0000 Subject: [PATCH 6/6] EL7 Support --- diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec index 0f1fbbb..6091eb9 100644 --- a/dist-git/copr-dist-git.spec +++ b/dist-git/copr-dist-git.spec @@ -46,7 +46,11 @@ 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: mock-scm