rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Minor conditional updates to enable building for ELN

Browse Source 
Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius 2020-09-17 16:16:13 -05:00
parent 386876fb24
commit 4417144648
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
podman.spec
View File

@ -3,7 +3,7 @@
%global with_check 0 %global with_check 0
%global with_unit_test 0 %global with_unit_test 0
%if 0%{?fedora} || 0%{?centos} >= 8 %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln}
#### DO NOT REMOVE - NEEDED FOR CENTOS #### DO NOT REMOVE - NEEDED FOR CENTOS
%global with_debug 1 %global with_debug 1
%else %else
@ -57,7 +57,7 @@ Version: 2.1.0
# N.foo if released, 0.N.foo if unreleased # N.foo if released, 0.N.foo if unreleased
# Rawhide almost always ships unreleased builds, # Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.foo # so release tag should be of the form 0.N.foo
Release: 0.279.dev.git%{shortcommit0}%{?dist} Release: 0.280.dev.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 License: ASL 2.0
URL: https://%{name}.io/ URL: https://%{name}.io/
@ -89,13 +89,13 @@ Requires: conmon >= 2:2.0.16-1
Requires: oci-runtime Requires: oci-runtime
Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
Obsoletes: oci-systemd-hook <= 0.2.0-3 Obsoletes: oci-systemd-hook <= 0.2.0-3
%if 0%{?fedora} %if 0%{?fedora} || 0%{?eln}
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
BuildRequires: ostree-devel BuildRequires: ostree-devel
Recommends: fuse-overlayfs >= 0.3-8 Recommends: fuse-overlayfs >= 0.3-8
Recommends: crun >= 0.14-2 Recommends: crun >= 0.14-2
%endif %endif
%if 0%{?fedora} || 0%{?centos} >= 8 %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?eln}
Recommends: catatonit Recommends: catatonit
Recommends: container-selinux Recommends: container-selinux
Recommends: runc Recommends: runc
@ -361,7 +361,7 @@ This package contains unit tests for project
providing packages with %{import_path} prefix. providing packages with %{import_path} prefix.
%endif %endif
%if 0%{?fedora} %if 0%{?fedora} || 0%{?eln}
%package tests %package tests
Summary: Tests for %{name} Summary: Tests for %{name}
@ -461,7 +461,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build
install.systemd \ install.systemd \
install.completions \ install.completions \
install.docker \ install.docker \
%if 0%{?fedora} %if 0%{?fedora} || 0%{?eln}
install.remote-nobuild \ install.remote-nobuild \
%endif %endif
@ -595,7 +595,7 @@ exit 0
%endif %endif
#### DO NOT REMOVE - NEEDED FOR CENTOS #### DO NOT REMOVE - NEEDED FOR CENTOS
%if 0%{?fedora} %if 0%{?fedora} || 0%{?eln}
%files remote %files remote
%license LICENSE %license LICENSE
%{_bindir}/%{name}-remote %{_bindir}/%{name}-remote
@ -614,6 +614,9 @@ exit 0
# rhcontainerbot account currently managed by lsm5 # rhcontainerbot account currently managed by lsm5
%changelog %changelog
* Thu Sep 17 2020 Merlin Mathesius <mmathesi@redhat.com> - 2:2.1.0-0.280.dev.git1a929c7
- Minor conditional updates to enable building for ELN
* Thu Sep 17 21:13:18 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.279.dev.gitf84f441 * Thu Sep 17 21:13:18 UTC 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.279.dev.gitf84f441
- autobuilt f84f441 - autobuilt f84f441