From a2713819de6486d35208a0cd14ff5677ec4e621a Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Sep 17 2020 07:04:48 +0000
Subject: CentOS Release package for Gluster 8


---

diff --git a/SOURCES/CentOS-Gluster-7.repo b/SOURCES/CentOS-Gluster-7.repo
deleted file mode 100644
index 18f0c64..0000000
--- a/SOURCES/CentOS-Gluster-7.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-# CentOS-Gluster-7.repo
-#
-# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more
-# information
-
-[centos-gluster7]
-name=CentOS-$releasever - Gluster 7
-mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$releasever&repo=storage-gluster-7
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/gluster-7/
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
-
-[centos-gluster7-test]
-name=CentOS-$releasever - Gluster 7 Testing
-baseurl=http://buildlogs.centos.org/centos/$releasever/storage/$basearch/gluster-7/
-gpgcheck=0
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
-
diff --git a/SOURCES/CentOS-Gluster-8.repo b/SOURCES/CentOS-Gluster-8.repo
new file mode 100644
index 0000000..cff8329
--- /dev/null
+++ b/SOURCES/CentOS-Gluster-8.repo
@@ -0,0 +1,20 @@
+# CentOS-Gluster-8.repo
+#
+# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more
+# information
+
+[centos-gluster8]
+name=CentOS-$releasever - Gluster 8
+mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$releasever&repo=storage-gluster-8
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/gluster-8/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
+
+[centos-gluster8-test]
+name=CentOS-$releasever - Gluster 8 Testing
+baseurl=http://buildlogs.centos.org/centos/$releasever/storage/$basearch/gluster-8/
+gpgcheck=0
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
+
diff --git a/SPECS/centos-release-gluster7.spec b/SPECS/centos-release-gluster7.spec
deleted file mode 100644
index 190fa7c..0000000
--- a/SPECS/centos-release-gluster7.spec
+++ /dev/null
@@ -1,65 +0,0 @@
-Summary: Gluster 7 packages from the CentOS Storage SIG repository
-Name: centos-release-gluster7
-Version: 1.0
-Release: 2%{?dist}
-License: GPLv2
-URL: http://wiki.centos.org/SpecialInterestGroup/Storage
-Source0: CentOS-Gluster-7.repo
-Source1: 75-gluster.preset
-%if 0%{?centos} >= 8
-BuildRequires: systemd
-%endif
-BuildArch: noarch
-
-%if 0%{?centos} >= 8
-# $contentdir for altarch support was added with CentOS-7.5
-Requires: centos-release >= 8.1
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-%endif
-# This provides the public key to verify the RPMs
-Requires: centos-release-storage-common
-
-Provides: centos-release-gluster = 7
-
-%description
-yum configuration for Gluster 7 packages from the CentOS Storage SIG. Gluster
-7 will receive updates for approximately 12 months. For more details about the
-release and maintenance schedule, see
-https://www.gluster.org/community/release-schedule
-
-%install
-install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-7.repo
-%if 0%{?centos} < 8
-sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-7.repo
-%endif
-%if 0%{?centos} >= 8
-install -D -m 644 %{SOURCE1} %{buildroot}%{_presetdir}/$(basename %{SOURCE1})
-%endif
-
-%if 0%{?centos} >= 8
-%post
-%systemd_post
-
-%preun
-%systemd_preun
-
-%postun
-%systemd_postun
-%endif
-
-%files
-%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Gluster-7.repo
-%if 0%{?centos} >= 8
-%{_presetdir}/75-gluster.preset
-%endif
-
-%changelog
-* Wed Mar 25 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1.0-2
-- enabled
-
-* Wed Aug 28 2019 Niels de Vos <ndevos@redhat.com> - 1.0-1
-- Initial version based on centos-release-gluster6
-- Only the centos-gluster7-test repo is enabled during pre-release
diff --git a/SPECS/centos-release-gluster8.spec b/SPECS/centos-release-gluster8.spec
new file mode 100644
index 0000000..8ad3830
--- /dev/null
+++ b/SPECS/centos-release-gluster8.spec
@@ -0,0 +1,61 @@
+Summary: Gluster 8 packages from the CentOS Storage SIG repository
+Name: centos-release-gluster8
+Version: 1.0
+Release: 1%{?dist}
+License: GPLv2
+URL: http://wiki.centos.org/SpecialInterestGroup/Storage
+Source0: CentOS-Gluster-8.repo
+Source1: 75-gluster.preset
+%if 0%{?centos} >= 8
+BuildRequires: systemd
+%endif
+BuildArch: noarch
+
+%if 0%{?centos} >= 8
+# $contentdir for altarch support was added with CentOS-7.5
+Requires: centos-release >= 8.1
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%endif
+# This provides the public key to verify the RPMs
+Requires: centos-release-storage-common
+
+Provides: centos-release-gluster = 8
+
+%description
+DNF configuration for Gluster 8 packages from the CentOS Storage SIG. Gluster
+8 will receive updates for approximately 12 months. For more details about the
+release and maintenance schedule, see
+https://www.gluster.org/community/release-schedule
+
+%install
+install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-8.repo
+%if 0%{?centos} < 8
+sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-8.repo
+%endif
+%if 0%{?centos} >= 8
+install -D -m 644 %{SOURCE1} %{buildroot}%{_presetdir}/$(basename %{SOURCE1})
+%endif
+
+%if 0%{?centos} >= 8
+%post
+%systemd_post
+
+%preun
+%systemd_preun
+
+%postun
+%systemd_postun
+%endif
+
+%files
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Gluster-8.repo
+%if 0%{?centos} >= 8
+%{_presetdir}/75-gluster.preset
+%endif
+
+%changelog
+* Thu Sep 17 2020 Niels de Vos <ndevos@redhat.com> - 1.0-1
+- Initial version based on centos-release-gluster7