From a5f0a91866aa700126d055df94bb294894cd6fd2 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 19 2020 11:23:45 +0000 Subject: initial Signed-off-by: Kaleb S. KEITHLEY --- diff --git a/README.md b/README.md index 2f77ecc..ee65660 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,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-gluster6.spec $ cbs build core8-extras-common-el8.centos \ - centos-release-gluster7-0.1-1.el8.centos.src.rpm + centos-release-gluster6-0.1-1.el8.centos.src.rpm diff --git a/SOURCES/CentOS-Gluster-6.repo b/SOURCES/CentOS-Gluster-6.repo new file mode 100644 index 0000000..44f9abf --- /dev/null +++ b/SOURCES/CentOS-Gluster-6.repo @@ -0,0 +1,20 @@ +# CentOS-Gluster-6.repo +# +# Please see http://wiki.centos.org/SpecialInterestGroup/Storage for more +# information + +[centos-gluster6] +name=CentOS-$releasever - Gluster 6 +mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=$releasever&repo=storage-gluster-6 +#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/gluster-6/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-gluster6-test] +name=CentOS-$releasever - Gluster 6 Testing +baseurl=http://buildlogs.centos.org/centos/$releasever/storage/$basearch/gluster-6/ +gpgcheck=0 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + diff --git a/SOURCES/CentOS-Gluster-7.repo b/SOURCES/CentOS-Gluster-7.repo deleted file mode 100644 index 391cea0..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=0 -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=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - diff --git a/SPECS/centos-release-gluster6.spec b/SPECS/centos-release-gluster6.spec new file mode 100644 index 0000000..60f9a57 --- /dev/null +++ b/SPECS/centos-release-gluster6.spec @@ -0,0 +1,62 @@ +Summary: Gluster 6 packages from the CentOS Storage SIG repository +Name: centos-release-gluster6 +Version: 1.0 +Release: 1%{?dist} +License: GPLv2 +URL: http://wiki.centos.org/SpecialInterestGroup/Storage +Source0: CentOS-Gluster-6.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 = 6 + +%description +yum configuration for Gluster 6 packages from the CentOS Storage SIG. Gluster +6 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-6.repo +%if 0%{?centos} < 8 +sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-6.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-6.repo +%if 0%{?centos} >= 8 +%{_presetdir}/75-gluster.preset +%endif + +%changelog +* Wed Aug 28 2019 Niels de Vos - 0.1-1 +- Initial version based on centos-release-gluster6 +- Only the centos-gluster6-test repo is enabled during pre-release diff --git a/SPECS/centos-release-gluster7.spec b/SPECS/centos-release-gluster7.spec deleted file mode 100644 index f2dbf97..0000000 --- a/SPECS/centos-release-gluster7.spec +++ /dev/null @@ -1,62 +0,0 @@ -Summary: Gluster 7 packages from the CentOS Storage SIG repository -Name: centos-release-gluster7 -Version: 1.0 -Release: 1%{?dist} -License: GPLv2 -URL: http://wiki.centos.org/SpecialInterestGroup/Storage -Source0: CentOS-Gluster-7.repo -Source1: 75-gluster.preset -%if 0%{?centos} >= 7 -BuildRequires: systemd -%endif -BuildArch: noarch - -%if 0%{?centos} >= 7 -# $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} < 7 -sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Gluster-7.repo -%endif -%if 0%{?centos} >= 7 -install -D -m 644 %{SOURCE1} %{buildroot}%{_presetdir}/$(basename %{SOURCE1}) -%endif - -%if 0%{?centos} >= 7 -%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} >= 7 -%{_presetdir}/75-gluster.preset -%endif - -%changelog -* Wed Aug 28 2019 Niels de Vos - 0.1-1 -- Initial version based on centos-release-gluster6 -- Only the centos-gluster7-test repo is enabled during pre-release