PR#18: EL7 Support for Copr-mocks - copr/copr

Martin Juhl • 8 years ago

457465d

Martin Juhl • 8 years ago

c93a013

Martin Juhl • 8 years ago

c9b2f64

Martin Juhl • 8 years ago

ec8d8c9

backend/copr-backend.spec

file modified

+7 -1

		`@@ -4,7 +4,7 @@`

		`Name: copr-backend`
		`Version: 1.95`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Backend for Copr`

		`Group: Applications/Productivity`
		`@@ -93,7 +93,10 @@`
		`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`
		`@@ -259,6 +262,9 @@`
		`%exclude %{_pkgdocdir}/playbooks`

		`%changelog`
		`+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 1.95-2`
		`+ - EL7 Support`
		`+`
		`* Thu Dec 01 2016 clime <clime@redhat.com> 1.95-1`
		`- use buildroot_pkgs substitution type according to job.chroot`
		`- use timeout command to respect timeout param coming from frontend`

dist-git/copr-dist-git.spec

file modified

+8 -1

		`@@ -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: 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 @@`
		`%ghost %{_var}/log/copr-dist-git/*.log`

		`%changelog`
		`+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 0.23-2`
		`+ - EL7 Support`
		`+`
		`* Thu Dec 01 2016 clime <clime@redhat.com> 0.23-1`
		`- use other than epel chroot for scm building`
		`- use newest mock`

mocks/copr-mocks.spec

file modified

+11 -1

		`@@ -11,11 +11,18 @@`

		`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 @@`
		`%{_unitdir}/copr-mocks-frontend.service`

		`%changelog`
		`+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 1.6-2`
		`+ - EL7 Support`
		`+`
		`* Thu Dec 01 2016 clime <clime@redhat.com> 1.6-1`
		`- ignore ValueError exception`