diff --git a/README.md b/README.md index 2f77ecc..69ee94c 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -centos-release-gluster7 provides the YUM repository file for the -CentOS Storage SIG that provide GlusterFS 7. +centos-release-gluster9 provides the YUM repository file for the +CentOS Storage SIG that provide GlusterFS 9. This package needs to get built against the following targets so that the packages land at the right tag for inclusion in CentOS Extras: - - core6-extras-common-el6.centos (tag: core6-extras-common-candidate) - core7-extras-common-el7.centos (tag: core7-extras-common-candidate) - core8-extras-common-el8.centos (tag: core8-extras-common-candidate) @@ -13,8 +12,8 @@ Building the package can be done like this: $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ --define "dist .el8.centos" \ - SPECS/centos-release-gluster7.spec + SPECS/centos-release-gluster9.spec $ cbs build core8-extras-common-el8.centos \ - centos-release-gluster7-0.1-1.el8.centos.src.rpm + centos-release-gluster9-0.1-1.el8.centos.src.rpm diff --git a/SOURCES/CentOS-Gluster-8.repo b/SOURCES/CentOS-Gluster-8.repo deleted file mode 100644 index cff8329..0000000 --- a/SOURCES/CentOS-Gluster-8.repo +++ /dev/null @@ -1,20 +0,0 @@ -# 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/SOURCES/CentOS-Gluster-9.repo b/SOURCES/CentOS-Gluster-9.repo new file mode 100644 index 0000000..bbf4639 --- /dev/null +++ b/SOURCES/CentOS-Gluster-9.repo @@ -0,0 +1,20 @@ +# CentOS-Gluster-9.repo +# +# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more +# information + +[centos-gluster9] +name=CentOS-$releasever - Gluster 9 +mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$releasever&repo=storage-gluster-9 +#baseurl=http://mirror.centos.org/$contentdir/$releasever/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-$releasever - Gluster 9 Testing +baseurl=http://buildlogs.centos.org/centos/$releasever/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-gluster8.spec b/SPECS/centos-release-gluster8.spec deleted file mode 100644 index 8ad3830..0000000 --- a/SPECS/centos-release-gluster8.spec +++ /dev/null @@ -1,61 +0,0 @@ -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 - 1.0-1 -- Initial version based on centos-release-gluster7 diff --git a/SPECS/centos-release-gluster9.spec b/SPECS/centos-release-gluster9.spec new file mode 100644 index 0000000..fa1afb5 --- /dev/null +++ b/SPECS/centos-release-gluster9.spec @@ -0,0 +1,61 @@ +Summary: Gluster 9 packages from the CentOS Storage SIG repository +Name: centos-release-gluster9 +Version: 1.0 +Release: 1%{?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 +* Fri Jan 22 2021 Niels de Vos - 1.0-1 +- Initial version based on centos-release-gluster8