From 48a46928b807042426c9c33da5a2df3fee1e8545 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 18 May 2022 13:56:21 -0400 Subject: [PATCH] build deb packages using debbuild Signed-off-by: Lokesh Mandvekar --- containers-common.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index abecad6..7fe2994 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -16,18 +16,25 @@ Epoch: 4 Name: containers-common Version: 1 +%if "%{_vendor}" == "debbuild" +Release: 0%{?dist} +License: ASL-2.0+ +%else Release: %autorelease -Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch +%endif +Summary: Common configuration and documentation for containers BuildRequires: go-md2man Provides: skopeo-containers = %{epoch}:%{version}-%{release} +Requires: slirp4netns +Recommends: fuse-overlayfs +%if "%{_vendor}" != "debbuild" Requires: (container-selinux >= 2:2.162.1 if selinux-policy) +%endif Requires: oci-runtime Requires: container-network-stack Recommends: netavark -Recommends: fuse-overlayfs -Recommends: slirp4netns Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md Source2: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf Source3: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json @@ -52,7 +59,9 @@ Source21: registry.access.redhat.com.yaml Source22: registry.redhat.io.yaml Source23: %{github_containers}/common/%{common_branch}/docs/Containerfile.5.md Source24: %{github_containers}/common/%{common_branch}/docs/containerignore.5.md +%if "%{_vendor}" != "debbuild" Source25: %{github_containers}/common/%{common_branch}/docs/links/.containerignore.5 +%endif %description @@ -88,7 +97,9 @@ cp %{SOURCE21} . cp %{SOURCE22} . cp %{SOURCE23} . cp %{SOURCE24} . +%if "%{_vendor}" != "debbuild" cp %{SOURCE25} . +%endif %if 0%{?rhel} <= 8 sed -i 's/log_driver = "journald"/#log_driver = "journald"/' containers.conf @@ -163,4 +174,6 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +%if "%{_vendor}" != "debbuild" %autochangelog +%endif