From 0c03ee19601f594f8cbdefbb2e114cc7b1aca0d4 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Mar 31 2020 19:19:31 +0000 Subject: [packit] 0.7.21 upstream release Upstream tag: 0.7.21 Upstream commit: 682b4930 Signed-off-by: Packit Service --- diff --git a/.gitignore b/.gitignore index bf671df..6a64816 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /koji-containerbuild-f91348b0a60ef01d75ea3c3bd927a5231f256398.tar.gz /koji-containerbuild-b6dcb6555e20e7abd50488f76eb14588ebdf6301.tar.gz /koji-containerbuild-dab7501bd461e4ce85c5238f62cb353b3c6e8189.tar.gz +/0.7.21.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..eb9df80 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,20 @@ +# https://packit.dev/docs/configuration/ + +# name of downstream (Fedora) RPM package +downstream_package_name: koji-containerbuild + +# for packit service (Github app) +jobs: +- job: sync_from_downstream + trigger: commit +- job: propose_downstream + trigger: release + metadata: + dist-git-branch: fedora-all +- job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-all + - epel-7 + - epel-8 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..ed18e4e --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.9.0. diff --git a/koji-containerbuild.spec b/koji-containerbuild.spec index 22091c1..0c1fb1e 100644 --- a/koji-containerbuild.spec +++ b/koji-containerbuild.spec @@ -1,35 +1,37 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%endif - -%if 0%{?fedora} +# Enable Python 3 builds for Fedora/RHEL8 +%if 0%{?fedora} || 0%{?rhel} >= 8 %bcond_without python3 +# If the definition isn't available for python3_pkgversion, define it +%{?!python3_pkgversion:%global python3_pkgversion 3} %else %bcond_with python3 %endif -%global module koji_containerbuild - -%global owner release-engineering -%global project koji-containerbuild +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif -%global commit dab7501bd461e4ce85c5238f62cb353b3c6e8189 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global module koji_containerbuild -Name: %{project} -Version: 0.7.15 -Release: 2%{?dist} +Name: koji-containerbuild +Version: 0.7.21 +Release: 1%{?dist} Summary: Koji support for building layered container images +Group: 0.7.15ations/System License: LGPLv2 -URL: https://github.com/%{owner}/%{project} -Source0: https://github.com/%{owner}/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz +URL: https://github.com/containerbuildsystem/%{name} +Source0: https://github.com/containerbuildsystem/%{name}/archive/%{version}.tar.gz BuildArch: noarch -BuildRequires: python3 +%if 0%{with python3} BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python3-setuptools +%else +BuildRequires: python2-devel +BuildRequires: python-setuptools +%endif %description Koji support for building layered container images @@ -38,6 +40,7 @@ Koji support for building layered container images %package hub License: LGPLv2 Summary: Hub plugin that extend Koji to build layered container images +Group: Applications/System Requires: koji-containerbuild Requires: koji-hub @@ -48,52 +51,103 @@ Hub plugin that extend Koji to support building layered container images %package builder License: LGPLv2 Summary: Builder plugin that extend Koji to build layered container images +Group: Applications/System Requires: koji-builder Requires: koji-containerbuild Requires: osbs-client -Requires: python3-urlgrabber -Requires: python3-dockerfile-parse +Requires: python-dockerfile-parse +%if 0%{with python3} +Requires: python3-jsonschema +Requires: python3-six +%else +Requires: python2-jsonschema +Requires: python-six +%endif %description builder Builder plugin that extend Koji to communicate with OpenShift build system and build layered container images. -%package -n python3-%{name}-cli + +%package -n python2-%{name}-cli License: LGPLv2 Summary: CLI that communicates with Koji to control building layered container images +Group: Applications/System +%{?python_provide:%python_provide python2-%{name}-cli} +Provides: koji-containerbuild-cli +Requires: python2-koji >= 1.13 + +%description -n python2-%{name}-cli +Builder plugin that extend Koji to communicate with OpenShift build system and +build layered container images. + +%if 0%{with python3} +%package -n python%{python3_pkgversion}-%{name}-cli +License: LGPLv2 +Summary: CLI that communicates with Koji to control building layered container images +Group: Applications/System +%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-cli} +Provides: koji-containerbuild-cli Requires: python%{python3_pkgversion}-koji >= 1.13 -%description -n python3-%{name}-cli +%description -n python%{python3_pkgversion}-%{name}-cli Builder plugin that extend Koji to communicate with OpenShift build system and build layered container images. +%endif + %prep -%setup -qn %{name}-%{commit} +%setup -q + %build +%if 0%{with python3} %{__python3} setup.py build +%else +%{__python2} setup.py build +%endif %install +rm -rf $RPM_BUILD_ROOT +%if 0%{with python3} %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%else +%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%endif %{__install} -d $RPM_BUILD_ROOT%{_prefix}/lib/koji-hub-plugins %{__install} -p -m 0644 %{module}/plugins/hub_containerbuild.py $RPM_BUILD_ROOT%{_prefix}/lib/koji-hub-plugins/hub_containerbuild.py %{__install} -d $RPM_BUILD_ROOT%{_prefix}/lib/koji-builder-plugins %{__install} -p -m 0644 %{module}/plugins/builder_containerbuild.py $RPM_BUILD_ROOT%{_prefix}/lib/koji-builder-plugins/builder_containerbuild.py + +%if 0%{with python3} %{__install} -d $RPM_BUILD_ROOT%{python3_sitelib}/koji_cli_plugins %{__install} -p -m 0644 %{module}/plugins/cli_containerbuild.py $RPM_BUILD_ROOT%{python3_sitelib}/koji_cli_plugins/cli_containerbuild.py +%else +%{__install} -d $RPM_BUILD_ROOT%{python2_sitelib}/koji_cli_plugins +%{__install} -p -m 0644 %{module}/plugins/cli_containerbuild.py $RPM_BUILD_ROOT%{python2_sitelib}/koji_cli_plugins/cli_containerbuild.py +%endif %files +%if 0%{with python3} %{python3_sitelib}/* +%else +%{python2_sitelib}/* +%endif %doc docs AUTHORS README.rst %if 0%{?rhel} && 0%{?rhel} <= 6 %{!?_licensedir:%global license %doc} %endif %license LICENSE +%if 0%{with python3} %files -n python%{python3_pkgversion}-%{name}-cli %{python3_sitelib}/koji_cli_plugins +%else +%files -n python2-%{name}-cli +%{python2_sitelib}/koji_cli_plugins +%endif %files hub %{_prefix}/lib/koji-hub-plugins/hub_containerbuild.py* @@ -101,8 +155,14 @@ build layered container images. %files builder %{_prefix}/lib/koji-builder-plugins/builder_containerbuild.py* +%clean +rm -rf $RPM_BUILD_ROOT + %changelog +* Tue Mar 31 2020 Packit Service - 0.7.21-1 +- new upstream release: 0.7.21 + * Wed Jan 29 2020 Fedora Release Engineering - 0.7.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 2e83642..9f7491e 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -SHA512 (koji-containerbuild-ccef977b4ac0429fd9332a687b8ff852ad795fdd.tar.gz) = 7f3f903103c9126f6383bf87ca1417d4574ba45b9ced1a383007fbc9f3eb8785cbe20e8439f210f8961941d37b8d22f374f7f9d0f4dc0c52eb612af23fdee463 -SHA512 (koji-containerbuild-49e2b53033d4086a030d4a471dd034b8134d1253.tar.gz) = a119a650e17ac12c770119ffe8b1b5482e33998e7e09518928b3c62de045e4bf2f5984bad0c71dd60e611bd119d0aecda8c8ef1d3ca5c76de7f0d851785a5771 -SHA512 (koji-containerbuild-f91348b0a60ef01d75ea3c3bd927a5231f256398.tar.gz) = fc6d4ca7e8f5832622c9ca931bb0fa1e51dd330fc474d77579ee90f0ea9139257c861d3abcb745528950e5e834e597d4e05b0e506073e7eadaf4e69130322d2f -SHA512 (koji-containerbuild-b6dcb6555e20e7abd50488f76eb14588ebdf6301.tar.gz) = 0406a3d0802235b17e254ac96f1d8cf505b53a5cc04be47e42cd37713483939bcb15bc093374f5bcf806347c94a534c5d0c43ad440cc26186edcf799737261a7 -SHA512 (koji-containerbuild-dab7501bd461e4ce85c5238f62cb353b3c6e8189.tar.gz) = db2eaca630cee314100b86056e7930434f180c142a62ac1f700376a8e8daf2fb3cb2975885e134697c357ccb6b749da7e5950f1671a6792bbbb9ef24513cc22d +SHA512 (0.7.21.tar.gz) = 2344032d33e31616fce2d9159dd78780d14c8a2293c14d9fc0b9bdcc79c88e9820217cbd3d7f67c7bc69a54bf6d3ba7f72ffefe8f40bc0dc6280c918389467f3