Merge pull request #1040 from thaJeztah/remove_rhel7_rhel8_remnants

[master] rpm: remove CentOS/RHEL 7 leftovers

rpm/Makefile

@@ -94,11 +94,6 @@ $(DISTROS): sources
 
 .PHONY: sources
 sources: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/buildx.tgz rpmbuild/SOURCES/compose.tgz
-sources: rpmbuild/SOURCES/01-rlimit_nofile-rhel7.patch
-
-rpmbuild/SOURCES/%.patch:
-	mkdir -p $(@D)
-	cp $(CURDIR)/patches/$(@F) $@
 
 rpmbuild/SOURCES/engine.tgz:
 	mkdir -p $(@D)

rpm/SPECS/docker-ce-cli.spec

@@ -16,17 +16,8 @@ Packager: Docker <support@docker.com>
 Requires: /bin/sh
 Requires: /usr/sbin/groupadd
 
-# CentOS 7 and RHEL 7 do not yet support weak dependencies
-#
-# Note that we're not using <= 7 here, to account for other RPM distros, such
-# as Fedora, which would not have the rhel macro set (so default to 0).
-%if 0%{?rhel} == 7
-Requires: docker-buildx-plugin
-Requires: docker-compose-plugin
-%else
 Recommends: docker-buildx-plugin
 Recommends: docker-compose-plugin
-%endif
 
 BuildRequires: make
 BuildRequires: libtool-ltdl-devel

rpm/SPECS/docker-ce.spec

@@ -5,7 +5,6 @@ Version: %{_version}
 Release: %{_release}%{?dist}
 Epoch: 3
 Source0: engine.tgz
-Patch0: 01-rlimit_nofile-rhel7.patch
 Summary: The open-source application container engine
 Group: Tools/Docker
 License: ASL 2.0
@@ -15,15 +14,7 @@ Packager: Docker <support@docker.com>
 
 Requires: /usr/sbin/groupadd
 Requires: docker-ce-cli
-# CentOS 7 and RHEL 7 do not yet support weak dependencies
-#
-# Note that we're not using <= 7 here, to account for other RPM distros, such
-# as Fedora, which would not have the rhel macro set (so default to 0).
-%if 0%{?rhel} == 7
-Requires: docker-ce-rootless-extras
-%else
 Recommends: docker-ce-rootless-extras
-%endif
 Requires: container-selinux >= 2:2.74
 Requires: libseccomp >= 2.3
 Requires: systemd
@@ -78,9 +69,6 @@ depending on a particular stack or provider.
 
 %prep
 %setup -q -c -n src -a 0
-%if 0%{?rhel} == 7
-%patch -p1 -P 0
-%endif
 
 %build
 

rpm/SPECS/docker-compose-plugin.spec

@@ -12,13 +12,7 @@ URL: https://github.com/docker/compose/
 Vendor: Docker
 Packager: Docker <support@docker.com>
 
-# CentOS 7 and RHEL 7 do not yet support weak dependencies.
-#
-# Note that we're not using <= 7 here, to account for other RPM distros, such
-# as Fedora, which would not have the rhel macro set (so default to 0).
-%if 0%{?rhel} != 7
 Enhances: docker-ce-cli
-%endif
 
 BuildRequires: bash