diff --git a/README.md b/README.md index a34fa30..161a620 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -centos-release-ceph-nautilus provides the YUM repository file for packages of the -CentOS Storage SIG that are used with Ceph Nautilus +centos-release-ceph-octopus provides the YUM repository file for packages of the +CentOS Storage SIG that are used with Ceph Octopus This package needs to be built against the following targets so that the packages land at the right tag for inclusion in CentOS Extras: @@ -13,10 +13,7 @@ Building the package can be done like this: $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el7.centos" \ - SPECS/centos-release-ceph-nautilus.spec - - $ cbs \ - build core7-extras-common-el7.centos \ - centos-release-ceph-nautilus-1.2-2.el7.centos.src.rpm + --define "dist .el8.centos" \ + SPECS/centos-release-ceph-octopus.spec + Ask hughsjr in #centos-devel @FreeNode IRC to build diff --git a/SOURCES/CentOS-Ceph-Nautilus.repo b/SOURCES/CentOS-Ceph-Nautilus.repo deleted file mode 100644 index 61517de..0000000 --- a/SOURCES/CentOS-Ceph-Nautilus.repo +++ /dev/null @@ -1,26 +0,0 @@ -# CentOS-Ceph-Nautilus.repo -# -# Please see https://wiki.centos.org/SpecialInterestGroup/Storage for more -# information - -[centos-ceph-nautilus] -name=CentOS-$releasever - Ceph Nautilus -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=storage-ceph-nautilus -#baseurl=http://mirror.centos.org/$contentdir/$releasever/storage/$basearch/ceph-nautilus/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-nautilus-test] -name=CentOS-$releasever - Ceph Nautilus Testing -baseurl=https://buildlogs.centos.org/centos/$releasever/storage/$basearch/ceph-nautilus/ -gpgcheck=0 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-nautilus-source] -name=CentOS-$releasever - Ceph Nautilus Source -baseurl=http://vault.centos.org/$contentdir/$releasever/storage/Source/ceph-nautilus/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SOURCES/CentOS-Ceph-Octopus.repo b/SOURCES/CentOS-Ceph-Octopus.repo new file mode 100644 index 0000000..5a69547 --- /dev/null +++ b/SOURCES/CentOS-Ceph-Octopus.repo @@ -0,0 +1,26 @@ +# 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/SPECS/centos-release-ceph-nautilus.spec b/SPECS/centos-release-ceph-nautilus.spec index 37b10e0..01662a7 100644 --- a/SPECS/centos-release-ceph-nautilus.spec +++ b/SPECS/centos-release-ceph-nautilus.spec @@ -5,14 +5,14 @@ Release: 2%{?dist} License: GPLv2 URL: http://wiki.centos.org/SpecialInterestGroup/Storage Source0: CentOS-Ceph-Nautilus.repo -%if 0%{?centos} >= 7 +%if 0%{?centos} >= 8 BuildRequires: systemd %endif BuildArch: noarch -%if 0%{?centos} >= 7 -# $contentdir for altarch support was added with CentOS-7.5 -Requires: centos-release >= 7-5.1804.el7.centos.2 +%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 diff --git a/SPECS/centos-release-ceph-octopus.spec b/SPECS/centos-release-ceph-octopus.spec new file mode 100644 index 0000000..c44b266 --- /dev/null +++ b/SPECS/centos-release-ceph-octopus.spec @@ -0,0 +1,52 @@ +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 +