From e4eeb6be30a0d01947e9f1b691a573fbf4900643 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mar 14 2022 15:04:13 +0000 Subject: CentOS Stream 8, based on the Stream 9 version --- diff --git a/README.md b/README.md index 7b5cf5e..903291e 100644 --- a/README.md +++ b/README.md @@ -16,25 +16,25 @@ Building the package can be done like this: * create a src rpm for scratch builds $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el9s.centos" \ + --define "dist .el8s.centos" \ SPECS/centos-release-storage-common.spec -* commit and push .spec +* commit and push .spec $ git add SPECS/*.spec - $ git push origin c8-sig-storage-ceph-pacific + $ git push origin c8s-sig-storage-common * retrieve the commit: $ git log|head -n 1 commit 29f19456be12986e86392652331e3a56ff0a88a0 -* build - $ cbs build extras9s-extras-common-el9s \ +* build + $ cbs build extras8s-extras-common-el8s \ git+https://git.centos.org/rpms/centos-release-storage-common.git#29f19456be12986e86392652331e3a56ff0a88a0 * scratch build $ cbs --scratch \ - build core9s-extras-common-el9s.centos \ - centos-release-storage-common-2-2.el9s.centos.src.rpm + build core8s-extras-common-el8s.centos \ + centos-release-storage-common-1.0-1.el8s.centos.src.rpm diff --git a/SOURCES/CentOS-Storage-common.repo b/SOURCES/CentOS-Storage-common.repo index 614b2d8..726c504 100644 --- a/SOURCES/CentOS-Storage-common.repo +++ b/SOURCES/CentOS-Storage-common.repo @@ -4,8 +4,8 @@ # information [centos-storage-common] -name=CentOS-$releasever - Storage SIG - common -metalink=https://mirrors.centos.org/metalink?repo=centos-storage-sig-all-all-9-stream&arch=$basearch +name=CentOS-$stream - Storage SIG - common +mirrorlist=http://mirrorlist.centos.org?release=$stream&arch=$basearch&repo=storage-common gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SPECS/centos-release-storage-common.spec b/SPECS/centos-release-storage-common.spec index 590af6c..598ee02 100644 --- a/SPECS/centos-release-storage-common.spec +++ b/SPECS/centos-release-storage-common.spec @@ -1,8 +1,8 @@ Summary: Common release file to establish shared metadata for CentOS Storage SIG Name: centos-release-storage-common Epoch: 0 -Version: 2 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: RPM-GPG-KEY-CentOS-SIG-Storage @@ -11,17 +11,12 @@ URL: http://wiki.centos.org/SpecialInterestGroup/Storage BuildArch: noarch Provides: centos-release-storage-common -%if 0%{?centos} >= 7 -# $contentdir for altarch support was added with CentOS-7.5 -Requires: centos-release >= 7-5.1804.el7.centos.2 -%else Requires: centos-release -%endif BuildRoot: %{_tmppath}/%{name}-root %description -Common files needed by other centos-release components in the Storage SIG +Common files needed by other centos-release components in the Storage SIG. %prep %setup -q -n %{name} -T -c @@ -32,9 +27,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ install -m 644 %SOURCE0 $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/yum.repos.d/ -%if 0%{?centos} < 7 -sed -i 's/\$contentdir/centos/g' $RPM_BUILD_ROOT/etc/yum.repos.d/$(basename %SOURCE1) -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -45,21 +37,5 @@ rm -rf $RPM_BUILD_ROOT /etc/yum.repos.d/CentOS-Storage-common.repo %changelog -* Wed Jan 26 2022 Kaleb S. KEITHLEY - 2-4 -- mirror.c.o -> mirrors.c.o - -* Wed Jan 19 2022 Kaleb S. KEITHLEY - 2-3 -- c9s - -* Tue Jul 31 2018 Niels de Vos - 2-2 -- Add support for altarch repositories - -* Fri Sep 22 2017 Niels de Vos - 2-1 -- Add CentOS-Storage-common.repo with shared debuginfo repo - -* Thu Nov 12 2015 Niels de Vos - 1-2 -- rebuild for CentOS Extras - -* Thu Nov 12 2015 Niels de Vos - 1-1 -- Basic setup with the gpg key -- Based on the centos-release-virt-common package +* Mon Mar 14 2022 Niels de Vos - 1.0-1 +- CentOS Stream 8, based on the Stream 9 version