From 627d23944cc96a1ac9af10f123a0d7e19b9c754c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Oct 26 2021 12:44:08 +0000 Subject: Gluster 10 pre-release for testing --- diff --git a/README.md b/README.md index 69ee94c..1bf158b 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,20 @@ -centos-release-gluster9 provides the YUM repository file for the -CentOS Storage SIG that provide GlusterFS 9. +centos-release-gluster10 provides the YUM repository file for the +CentOS Storage SIG that provide GlusterFS 10. This package needs to get built against the following targets so that the packages land at the right tag for inclusion in CentOS Extras: - - core7-extras-common-el7.centos (tag: core7-extras-common-candidate) - core8-extras-common-el8.centos (tag: core8-extras-common-candidate) + - core8s-extras-common-el8s.centos (tag: core8s-extras-common-candidate) + - core9s-extras-common-el9s.centos (tag: core9s-extras-common-candidate) Building the package can be done like this: $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el8.centos" \ - SPECS/centos-release-gluster9.spec + --define "dist .el9s.centos" \ + SPECS/centos-release-gluster10.spec - $ cbs build core8-extras-common-el8.centos \ - centos-release-gluster9-0.1-1.el8.centos.src.rpm + $ cbs build core9s-extras-common-el9s.centos \ + centos-release-gluster10-0.1-1.el9s.centos.src.rpm diff --git a/SOURCES/CentOS-Gluster-10.repo b/SOURCES/CentOS-Gluster-10.repo new file mode 100644 index 0000000..04d81df --- /dev/null +++ b/SOURCES/CentOS-Gluster-10.repo @@ -0,0 +1,20 @@ +# CentOS-Gluster-10.repo +# +# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more +# information + +[centos-gluster10] +name=CentOS-$stream - Gluster 10 +mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$stream&repo=storage-gluster-10 +#baseurl=http://mirror.centos.org/$contentdir/$stream/storage/$basearch/gluster-10/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-gluster10-test] +name=CentOS-$stream - Gluster 10 Testing +baseurl=http://buildlogs.centos.org/centos/$stream/storage/$basearch/gluster-10/ +gpgcheck=0 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + diff --git a/SOURCES/CentOS-Gluster-9.repo b/SOURCES/CentOS-Gluster-9.repo deleted file mode 100644 index 5f25727..0000000 --- a/SOURCES/CentOS-Gluster-9.repo +++ /dev/null @@ -1,20 +0,0 @@ -# CentOS-Gluster-9.repo -# -# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more -# information - -[centos-gluster9] -name=CentOS-$stream - Gluster 9 -mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$stream&repo=storage-gluster-9 -#baseurl=http://mirror.centos.org/$contentdir/$stream/storage/$basearch/gluster-9/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-gluster9-test] -name=CentOS-$stream - Gluster 9 Testing -baseurl=http://buildlogs.centos.org/centos/$stream/storage/$basearch/gluster-9/ -gpgcheck=0 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - diff --git a/SPECS/centos-release-gluster10.spec b/SPECS/centos-release-gluster10.spec new file mode 100644 index 0000000..911e206 --- /dev/null +++ b/SPECS/centos-release-gluster10.spec @@ -0,0 +1,56 @@ +Summary: Gluster 10 packages from the CentOS Storage SIG repository +Name: centos-release-gluster10 +Version: 0.1 +Release: 1%{?dist} +License: GPLv2 +URL: http://wiki.centos.org/SpecialInterestGroup/Storage +Source0: CentOS-Gluster-10.repo +Source1: 75-gluster.preset +%if 0%{?centos} >= 8 +BuildRequires: systemd +%endif +BuildArch: noarch + +Requires: centos-release >= 8.1 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +Requires: centos-release-storage-common + +# testing phase, users installing centos-release-gluster should not get this +# version yet +#Provides: centos-release-gluster = 10 + +%description +DNF configuration for Gluster 10 packages from the CentOS Storage SIG. Gluster +10 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-10.repo +install -D -m 644 %{SOURCE1} %{buildroot}%{_presetdir}/$(basename %{SOURCE1}) + +%post +%systemd_post glusterd.service + +%preun +%systemd_preun glusterd.service + +%postun +%systemd_postun glusterd.service + +%files +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Gluster-10.repo +%{_presetdir}/75-gluster.preset + +%changelog +* Tue Oct 26 2021 Niels de Vos - 0.1-1 +- Gluster 10 pre-release + +* Mon Jun 21 2021 Kaleb S. KEITHLEY - 1.0-2 +- c8stream + +* Fri Jan 22 2021 Niels de Vos - 1.0-1 +- Initial version based on centos-release-gluster8 diff --git a/SPECS/centos-release-gluster9.spec b/SPECS/centos-release-gluster9.spec deleted file mode 100644 index 7ead719..0000000 --- a/SPECS/centos-release-gluster9.spec +++ /dev/null @@ -1,64 +0,0 @@ -Summary: Gluster 9 packages from the CentOS Storage SIG repository -Name: centos-release-gluster9 -Version: 1.0 -Release: 2%{?dist} -License: GPLv2 -URL: http://wiki.centos.org/SpecialInterestGroup/Storage -Source0: CentOS-Gluster-9.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 = 9 - -%description -DNF configuration for Gluster 9 packages from the CentOS Storage SIG. Gluster -9 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-9.repo -%if 0%{?centos} < 8 -sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-9.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-9.repo -%if 0%{?centos} >= 8 -%{_presetdir}/75-gluster.preset -%endif - -%changelog -* Mon Jun 21 2021 Kaleb S. KEITHLEY - 1.0-2 -- c8stream - -* Fri Jan 22 2021 Niels de Vos - 1.0-1 -- Initial version based on centos-release-gluster8