From 0464c213c826cdcd583328a57d2cc5ab3152d591 Mon Sep 17 00:00:00 2001
From: Andrei Lukoshko <alukoshko@cloudlinux.com>
Date: Wed, 26 May 2021 02:32:21 +0300
Subject: [PATCH] Disable PowerTools by default and move to separate file

---
 almalinux-powertools.repo | 30 ++++++++++++++++++++++++++++++
 almalinux-release.spec    |  4 ++++
 almalinux.repo            | 27 ---------------------------
 3 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 almalinux-powertools.repo

diff --git a/almalinux-powertools.repo b/almalinux-powertools.repo
new file mode 100644
index 0000000..89f260b
--- /dev/null
+++ b/almalinux-powertools.repo
@@ -0,0 +1,30 @@
+# almalinux-powertools.repo
+
+[powertools]
+name=AlmaLinux $releasever - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+fastestmirror=1
+
+## Sources
+[powertools-source]
+name=AlmaLinux $releasever - PowerTools Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+fastestmirror=1
+
+## Debuginfo
+[powertools-debuginfo]
+name=AlmaLinux $releasever - PowerTools debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+fastestmirror=1
diff --git a/almalinux-release.spec b/almalinux-release.spec
index 91a4d9f..78c4df0 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -50,6 +50,7 @@ Source201:      GPL
 
 Source300:      almalinux.repo
 Source301:      almalinux-ha.repo
+Source302:      almalinux-powertools.repo
 
 %description
 %{product_family} release files
@@ -114,6 +115,7 @@ install -m 644 %{SOURCE10} %{buildroot}/etc/pki/rpm-gpg
 mkdir -p -m 755 %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE301} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d
 
 mkdir -p -m 755 %{buildroot}/etc/dnf/vars
 echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
@@ -165,6 +167,7 @@ rm -rf %{buildroot}
 /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 %config(noreplace) /etc/yum.repos.d/almalinux.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
+%config(noreplace) /etc/yum.repos.d/almalinux-powertools.repo
 %config(noreplace) /etc/os-release
 %config /etc/system-release-cpe
 %config(noreplace) /etc/issue
@@ -180,6 +183,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu May 20 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-2
 - 8.4 stable release
+- Disable PowerTools repo by default and move it to separate file
 
 * Fri Apr 16 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-1
 - 8.4 beta release
diff --git a/almalinux.repo b/almalinux.repo
index 485a8c9..1189425 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -18,15 +18,6 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
-[powertools]
-name=AlmaLinux $releasever - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-fastestmirror=1
-
 [extras]
 name=AlmaLinux $releasever - Extras
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
@@ -55,15 +46,6 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
-[powertools-source]
-name=AlmaLinux $releasever - PowerTools Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-fastestmirror=1
-
 [extras-source]
 name=AlmaLinux $releasever - Extras Source
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
@@ -92,15 +74,6 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
-[powertools-debuginfo]
-name=AlmaLinux $releasever - PowerTools debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-fastestmirror=1
-
 [extras-debuginfo]
 name=AlmaLinux $releasever - Extras debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo