remove debbuild macros to comply with fedora guidelines
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
554dba3090
commit
b4c18e3bd5
@ -16,29 +16,15 @@
|
|||||||
Epoch: 4
|
Epoch: 4
|
||||||
Name: containers-common
|
Name: containers-common
|
||||||
Version: 1
|
Version: 1
|
||||||
%if "%{_vendor}" == "debbuild"
|
|
||||||
Release: 0%{?dist}
|
|
||||||
License: ASL-2.0+
|
|
||||||
Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
|
|
||||||
%else
|
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%endif
|
|
||||||
Summary: Common configuration and documentation for containers
|
Summary: Common configuration and documentation for containers
|
||||||
BuildRequires: go-md2man
|
BuildRequires: go-md2man
|
||||||
Provides: skopeo-containers = %{epoch}:%{version}-%{release}
|
Provides: skopeo-containers = %{epoch}:%{version}-%{release}
|
||||||
Requires: slirp4netns
|
Requires: slirp4netns
|
||||||
Recommends: fuse-overlayfs
|
Recommends: fuse-overlayfs
|
||||||
%if "%{_vendor}" != "debbuild"
|
|
||||||
Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
|
Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
|
||||||
%else
|
|
||||||
Obsoletes: golang-github-%{name} < %{epoch}:%{version}-%{release}
|
|
||||||
Obsoletes: golang-github-containers-image < %{epoch}:%{version}-%{release}
|
|
||||||
Provides: %{name} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: golang-github-%{name} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: golang-github-containers-image = %{epoch}:%{version}-%{release}
|
|
||||||
%endif
|
|
||||||
Requires: oci-runtime
|
Requires: oci-runtime
|
||||||
Requires: container-network-stack
|
Requires: container-network-stack
|
||||||
Recommends: netavark
|
Recommends: netavark
|
||||||
@ -66,9 +52,7 @@ Source21: registry.access.redhat.com.yaml
|
|||||||
Source22: registry.redhat.io.yaml
|
Source22: registry.redhat.io.yaml
|
||||||
Source23: %{github_containers}/common/%{common_branch}/docs/Containerfile.5.md
|
Source23: %{github_containers}/common/%{common_branch}/docs/Containerfile.5.md
|
||||||
Source24: %{github_containers}/common/%{common_branch}/docs/containerignore.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
|
Source25: %{github_containers}/common/%{common_branch}/docs/links/.containerignore.5
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -104,9 +88,7 @@ cp %{SOURCE21} .
|
|||||||
cp %{SOURCE22} .
|
cp %{SOURCE22} .
|
||||||
cp %{SOURCE23} .
|
cp %{SOURCE23} .
|
||||||
cp %{SOURCE24} .
|
cp %{SOURCE24} .
|
||||||
%if "%{_vendor}" != "debbuild"
|
|
||||||
cp %{SOURCE25} .
|
cp %{SOURCE25} .
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?rhel} <= 8
|
%if 0%{?rhel} <= 8
|
||||||
sed -i 's/log_driver = "journald"/#log_driver = "journald"/' containers.conf
|
sed -i 's/log_driver = "journald"/#log_driver = "journald"/' containers.conf
|
||||||
@ -181,6 +163,4 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
|
|||||||
%{_datadir}/rhel/secrets/*
|
%{_datadir}/rhel/secrets/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
%if "%{_vendor}" != "debbuild"
|
|
||||||
%autochangelog
|
%autochangelog
|
||||||
%endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user