From 9814c72373beeed369c9ae2c3adbd8fd50ff7739 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Jul 01 2021 20:09:33 +0000
Subject: ceph-14.2.22 GA (and build from lookaside)


---

diff --git a/README.md b/README.md
index e87e95b..c07906e 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@ Branch names follow convention like `c<VERSION>-sig-storage-ceph-VERSION>`
 as descibed on [Naming and Patterns for Mapping Git Branches to Koji Tags]
 (https://wiki.centos.org/BrianStinson/GitBranchesandKojiTags)
 
-* c7-sig-storage-ceph-nautilus: CentOS-8
 * c8-sig-storage-ceph-nautilus: CentOS-8
 * ...
 
@@ -14,15 +13,36 @@ can be found in the following places:
 
 * [Comunity Build System](https://wiki.centos.org/HowTos/CommunityBuildSystem)
 * [Storage SIG landing page](https://wiki.centos.org/SpecialInterestGroup/Storage/Gluster)
+* [SIGGuide](https://wiki.centos.org/SIGGuide#SIGGuide.2FContent.2FImport.Pushing_first_to_lookaside_cache)
 
-
-E.g. build the src.rpm with:
+E.g. build a src.rpm with:
     $ rpmbuild -bs \
                --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \
                --define "dist .el8" SPECS/ceph.spec
 
+Get the lookaside uploader script from ssh://git@git.centos.org/centos-git-common.git
+
 To build:
 
-    $ cbs build [--scratch] storage8-ceph-nautilus-el8 ceph-14.2.21-1.el8.src.rpm
+1. Upload the source tar file to the lookaside cache, e.g.:
+    $ lookaside_upload -f SOURCES/ceph-14.2.22.tar.gz -n ceph -b c8-sig-storage-ceph-nautilus
+
+2. update the .glusterfs.metadata with the hash from step 1:
+    $ cat .ceph.metadata
+e9c6a6a482b8e46117c2a6c37b50c569bd62d92e  SOURCES/ceph-14.2.22.tar.gz
+
+3. commit and push SPECS/ceph.spec and .ceph.metadata, e.g.:
+    $ git add SPECS/ceph.spec .ceph.metadata
+    $ git push origin c8-sig-storage-ceph-nautilus
+
+4. retrieve the commit for step 3:
+    $ git log|head -n 1
+commit 29f19456be12986e86392652331e3a56ff0a88a0
+
+5. build
+    $ cbs build storage8-ceph-nautilus-el8 git+https://git.centos.org/rpms/ceph.git#29f19456be12986e86392652331e3a56ff0a88a0
+
+
 
+    $ cbs build --scratch storage8-ceph-nautilus-el8 ceph-14.2.22-1.el8.src.rpm
 
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 11abce6..d0c9d21 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -110,7 +110,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	14.2.21
+Version:	14.2.22
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -291,6 +291,7 @@ BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
 BuildRequires:  python%{_python_buildid}-pyOpenSSL
 %endif
+BuildRequires:	golang-github-prometheus
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-jwt
@@ -304,6 +305,7 @@ BuildRequires:	xmlsec1-openssl
 BuildRequires:	xmlsec1-openssl-devel
 %endif
 %if 0%{?suse_version}
+BuildRequires:	golang-github-prometheus-prometheus
 BuildRequires:	libxmlsec1-1
 BuildRequires:	libxmlsec1-nss1
 BuildRequires:	libxmlsec1-openssl1
@@ -657,6 +659,9 @@ Requires:	librgw2 = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?rhel} || 0%{?fedora}
 Requires:	mailcap
 %endif
+%if 0%{?weak_deps}
+Recommends:	gawk
+%endif
 %description radosgw
 RADOS is a distributed object store used by the Ceph distributed
 storage system.  This package provides a REST gateway to the
@@ -1878,6 +1883,8 @@ fi
 %{_bindir}/radosgw-token
 %{_bindir}/radosgw-es
 %{_bindir}/radosgw-object-expirer
+%{_bindir}/rgw-gap-list
+%{_bindir}/rgw-gap-list-comparator
 %{_bindir}/rgw-orphan-list
 %{_mandir}/man8/radosgw.8*
 %dir %{_localstatedir}/lib/ceph/radosgw
@@ -2334,6 +2341,9 @@ exit 0
 
 
 %changelog
+* Thu Jul 1 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.22-1
+- ceph 14.2.22 GA
+
 * Thu May 13 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.21-1
 - ceph 14.2.21 GA
 
diff --git a/ceph-14.2.22-1.el8.src.rpm b/ceph-14.2.22-1.el8.src.rpm
new file mode 100644
index 0000000..178d39f
Binary files /dev/null and b/ceph-14.2.22-1.el8.src.rpm differ