From 66791e17efb802017c15dfa47aa600d1dbc99d72 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 5 Jul 2021 16:03:24 +0200
Subject: raise dependency on redhat-release >= 8.4 enable repo_gpgcheck for
 https://github.com/remicollet/remirepo/issues/175

---
 remi-modular.repo |  2 ++
 remi-release.spec | 14 +++++++++++---
 remi-safe.repo    |  2 ++
 remi.repo         |  4 ++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/remi-modular.repo b/remi-modular.repo
index 256fce0..8da9d1d 100644
--- a/remi-modular.repo
+++ b/remi-modular.repo
@@ -9,6 +9,7 @@ name=Remi's Modular repository for Enterprise Linux VERSION - $basearch
 mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/modular/$basearch/mirror
 enabled=1
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
 [remi-modular-test]
@@ -18,5 +19,6 @@ name=Remi's Modular testing repository for Enterprise Linux VERSION - $basearch
 mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/modular-test/$basearch/mirror
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
diff --git a/remi-release.spec b/remi-release.spec
index 8022105..beefc86 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -9,7 +9,7 @@
 Name:           remi-release
 %if %{?rhel} == 8
 # Match point release version
-Version:        8.3
+Version:        8.4
 Release:        1%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
@@ -34,8 +34,12 @@ Source2021:     RPM-GPG-KEY-remi2021
 
 BuildArchitectures: noarch
 
-# rpm -q --provides redhat-release => redhat-release = 8.1-3.3.el8
-# rpm -q --provides centos-release => redhat-release = 8.1-0
+# rpm -q --provides redhat-release        => redhat-release = 8.4-0.6.el8
+# rpm -q --provides centos-linux-release  => redhat-release = 8.4-1.2105.el8
+# rpm -q --provides centos-stream-release => redhat-release = 8.5-3.el8
+# rpm -q --provides almalinux-release     => redhat-release = 8.4-0.6
+# rpm -q --provides rocky-release         => redhat-release = 8.4-26.el8
+# rpm -q --provides cloudlinux-release    => redhat-release = 8.4-3.el8
 Requires:       redhat-release >= %{version}
 Requires:       system-release(releasever) = %{rhel}
 Requires:       epel-release   = %{rhel}
@@ -106,6 +110,10 @@ done
 
 
 %changelog
+* Fri Jul  2 2021 Remi Collet <remi@remirepo.net> - 8.4-1
+- raise dependency on redhat-release >= 8.4
+- enable repo_gpgcheck for https://github.com/remicollet/remirepo/issues/175
+
 * Mon Jan  4 2021 Remi Collet <remi@remirepo.net> - 8.3-1
 - add 2021 key (used for .src.rpm)
 
diff --git a/remi-safe.repo b/remi-safe.repo
index 148c6c2..6e9dd63 100644
--- a/remi-safe.repo
+++ b/remi-safe.repo
@@ -9,6 +9,7 @@ name=Safe Remi's RPM repository for Enterprise Linux VERSION - $basearch
 mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/safe/$basearch/mirror
 enabled=1
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
 [remi-safe-debuginfo]
@@ -16,4 +17,5 @@ name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
diff --git a/remi.repo b/remi.repo
index 8c76261..2f54615 100644
--- a/remi.repo
+++ b/remi.repo
@@ -9,6 +9,7 @@ name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
 mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/remi/$basearch/mirror
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
 [remi-test]
@@ -19,6 +20,7 @@ mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test/$basearch/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
 [remi-debuginfo]
@@ -26,6 +28,7 @@ name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
 [remi-test-debuginfo]
@@ -33,5 +36,6 @@ name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch - debug
 baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test/$basearch/
 enabled=0
 gpgcheck=1
+repo_gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
 
-- 
cgit