diff --git a/README.md b/README.md index fc439e4..0b7f87d 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,16 @@ -centos-release-ceph-octopus provides the YUM repository file for packages of the -CentOS Storage SIG that are used with Ceph Octopus +centos-release-ceph-pacific provides the YUM repository file for packages of the +CentOS Storage SIG that are used with Ceph Pacific This package needs to be 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) Building the package can be done like this: - $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ --define "dist .el8.centos" \ - SPECS/centos-release-ceph-octopus.spec + SPECS/centos-release-ceph-pacific.spec Ask hughesjr in #centos-devel @FreeNode IRC to build diff --git a/SOURCES/CentOS-Ceph-Octopus.repo b/SOURCES/CentOS-Ceph-Octopus.repo deleted file mode 100644 index 5a69547..0000000 --- a/SOURCES/CentOS-Ceph-Octopus.repo +++ /dev/null @@ -1,26 +0,0 @@ -# CentOS-Ceph-Octopus.repo -# -# Please see https://wiki.centos.org/SpecialInterestGroup/Storage for more -# information - -[centos-ceph-octopus] -name=CentOS-$releasever - Ceph Octopus -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=storage-ceph-octopus -#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/ceph-octopus/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-octopus-test] -name=CentOS-$releasever - Ceph Octopus Testing -baseurl=https://buildlogs.centos.org/centos/$releasever/storage/$basearch/ceph-octopus/ -gpgcheck=0 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-octopus-source] -name=CentOS-$releasever - Ceph Octopus Source -baseurl=http://vault.centos.org/$contentdir/$releasever/storage/Source/ceph-octopus/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SOURCES/CentOS-Ceph-Pacific.repo b/SOURCES/CentOS-Ceph-Pacific.repo new file mode 100644 index 0000000..78cfb11 --- /dev/null +++ b/SOURCES/CentOS-Ceph-Pacific.repo @@ -0,0 +1,26 @@ +# CentOS-Ceph-Pacific.repo +# +# Please see https://wiki.centos.org/SpecialInterestGroup/Storage for more +# information + +[centos-ceph-pacific] +name=CentOS-$releasever - Ceph Pacific +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=storage-ceph-pacific +#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/ceph-pacific/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-ceph-pacific-test] +name=CentOS-$releasever - Ceph Pacific Testing +baseurl=https://buildlogs.centos.org/centos/$releasever/storage/$basearch/ceph-pacific/ +gpgcheck=0 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-ceph-pacific-source] +name=CentOS-$releasever - Ceph Pacific Source +baseurl=http://vault.centos.org/$contentdir/$releasever/storage/Source/ceph-pacific/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SPECS/centos-release-ceph-octopus.spec b/SPECS/centos-release-ceph-octopus.spec deleted file mode 100644 index c44b266..0000000 --- a/SPECS/centos-release-ceph-octopus.spec +++ /dev/null @@ -1,52 +0,0 @@ -Summary: Ceph Octopus packages from the CentOS Storage SIG repository -Name: centos-release-ceph-octopus -Version: 1.0 -Release: 1%{?dist} -License: GPLv2 -URL: http://wiki.centos.org/SpecialInterestGroup/Storage -Source0: CentOS-Ceph-Octopus.repo -%if 0%{?centos} >= 8 -BuildRequires: systemd -%endif -BuildArch: noarch - -%if 0%{?centos} >= 8 -# $contentdir for altarch support was added with CentOS-8.5 -Requires: centos-release >= 8-0.1905.el8 -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-ceph = 15 - -%description -yum configuration for Ceph Octopus packages from the CentOS Storage SIG. - -%install -install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Octopus.repo -%if 0%{?centos} < 7 -sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Octopus.repo -%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-Ceph-Octopus.repo - -%changelog -* Thu May 14 2020 Kaleb S. KEITHLEY - 1.0-1 -- initial checkin in git.centos.org ex github - diff --git a/SPECS/centos-release-ceph-pacific.spec b/SPECS/centos-release-ceph-pacific.spec new file mode 100644 index 0000000..87d5c84 --- /dev/null +++ b/SPECS/centos-release-ceph-pacific.spec @@ -0,0 +1,52 @@ +Summary: Ceph Pacific packages from the CentOS Storage SIG repository +Name: centos-release-ceph-pacific +Version: 1.0 +Release: 1%{?dist} +License: GPLv2 +URL: http://wiki.centos.org/SpecialInterestGroup/Storage +Source0: CentOS-Ceph-Pacific.repo +%if 0%{?centos} >= 8 +BuildRequires: systemd +%endif +BuildArch: noarch + +%if 0%{?centos} >= 8 +# $contentdir for altarch support was added with CentOS-8.5 +Requires: centos-release >= 8-0.1905.el8 +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-ceph = 15 + +%description +yum configuration for Ceph Pacific packages from the CentOS Storage SIG. + +%install +install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Pacific.repo +%if 0%{?centos} < 7 +sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Pacific.repo +%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-Ceph-Pacific.repo + +%changelog +* Thu May 14 2020 Kaleb S. KEITHLEY - 1.0-1 +- initial checkin in git.centos.org ex github +