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

podman-2.2.0-0.29.dev.git212011f.fc34

Browse Source 
- use %%rhel instead of %%eln, thanks to Adam Samalik for noticing

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2020-10-12 17:31:07 +02:00
parent e82738ee0d
commit 2f1f81de14
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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 || 0%{?eln} %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?rhel}
#### 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.2.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.28.dev.git%{shortcommit0}%{?dist} Release: 0.29.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,15 +89,15 @@ Requires: conmon >= 2:2.0.16-1
Requires: oci-runtime Requires: oci-runtime
Recommends: %{name}-plugins = %{epoch}:%{version}-%{release} Recommends: %{name}-plugins = %{epoch}:%{version}-%{release}
Obsoletes: oci-systemd-hook <= 0.2.0-3 Obsoletes: oci-systemd-hook <= 0.2.0-3
%if 0%{?fedora} && ! 0%{?eln} %if 0%{?fedora} && ! 0%{?rhel}
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
%endif %endif
%if 0%{?fedora} || 0%{?eln} %if 0%{?fedora} || 0%{?rhel}
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 || 0%{?eln} %if 0%{?fedora} || 0%{?centos} >= 8 || 0%{?rhel}
Recommends: catatonit Recommends: catatonit
Requires: (container-selinux if selinux-policy) Requires: (container-selinux if selinux-policy)
Recommends: runc Recommends: runc
@ -363,7 +363,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} || 0%{?eln} %if 0%{?fedora} || 0%{?rhel}
%package tests %package tests
Summary: Tests for %{name} Summary: Tests for %{name}
@ -463,7 +463,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} || 0%{?eln} %if 0%{?fedora} || 0%{?rhel}
install.remote-nobuild \ install.remote-nobuild \
%endif %endif
@ -597,7 +597,7 @@ exit 0
%endif %endif
#### DO NOT REMOVE - NEEDED FOR CENTOS #### DO NOT REMOVE - NEEDED FOR CENTOS
%if 0%{?fedora} || 0%{?eln} %if 0%{?fedora} || 0%{?rhel}
%files remote %files remote
%license LICENSE %license LICENSE
%{_bindir}/%{name}-remote %{_bindir}/%{name}-remote
@ -616,6 +616,9 @@ exit 0
# rhcontainerbot account currently managed by lsm5 # rhcontainerbot account currently managed by lsm5
%changelog %changelog
* Mon Oct 12 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.2.0-0.29.dev.git212011f
- use %%rhel instead of %%eln, thanks to Adam Samalik for noticing
* Mon Oct 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.28.dev.git212011f * Mon Oct 12 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.2.0-0.28.dev.git212011f
- autobuilt 212011f - autobuilt 212011f