diff --git a/_constraints b/_constraints
index 9cfd563..539e778 100644
--- a/_constraints
+++ b/_constraints
@@ -19,11 +19,12 @@
+ x86_64
ceph-test
- 40
+ 28
12
@@ -31,4 +32,64 @@
+
+
+ aarch64
+ ceph-test
+
+
+
+ 28
+
+
+ 8
+
+
+
+
+
+
+ ppc64le
+ ceph-test
+
+
+
+ 28
+
+
+ 8
+
+
+
+
+
+
+ s390x
+ ceph-test
+
+
+
+ 28
+
+
+ 8
+
+
+
+
+
+
+ aarch64
+ ceph-test
+
+
+
+ 28
+
+
+ 8
+
+
+
+
diff --git a/ceph-13.0.1-3204-g17e0216271.tar.bz2 b/ceph-13.0.1-3204-g17e0216271.tar.bz2
deleted file mode 100644
index cf6f213..0000000
--- a/ceph-13.0.1-3204-g17e0216271.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47a8e6d2f1a27d76a244b331f6adfcf02370f83cc7065fa9f8dc49222e396176
-size 67597003
diff --git a/ceph-13.0.2-984-g852d3f1411.tar.bz2 b/ceph-13.0.2-984-g852d3f1411.tar.bz2
new file mode 100644
index 0000000..2197350
--- /dev/null
+++ b/ceph-13.0.2-984-g852d3f1411.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77f8176659198bd1c9a1b4b29d260156bcae6a5717725a3fb4d16b1ad7807092
+size 71153341
diff --git a/ceph-test.changes b/ceph-test.changes
index 460ed4c..110f9ac 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
+
+- Update to 13.0.2-984-g852d3f1411:
+ + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4
+ + fixes s390x build failure (bsc#1089291)
+ + introduces liboath0 runtime dependency (bsc#1089302)
+ + fixes RGW SSL deployment
+
+-------------------------------------------------------------------
+Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com
+
+- Update to 13.0.2-819-gf64b021d4c:
+ + based on upstream master 3ab655b55d2b363c0352dfbb90caed2ffcd42432
+
+-------------------------------------------------------------------
+Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com
+
+- reduce ceph-test constraints for ppc64le and s390x
+
+-------------------------------------------------------------------
+Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de
+
+- Reduce ceph-test constraints on aarch64
+
-------------------------------------------------------------------
Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com
diff --git a/ceph-test.spec b/ceph-test.spec
index 47dae11..2a03b94 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph-test
-Version: 13.0.1.3204+g17e0216271
+Version: 13.0.2.984+g852d3f1411
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@@ -112,7 +112,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-common
Requires: xmlstarlet
Requires: jq
Requires: socat
@@ -147,6 +147,7 @@ BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
BuildRequires: libudev-devel
+BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libuuid-devel
@@ -226,6 +227,7 @@ BuildRequires: python3-Cython
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy
+BuildRequires: python%{_python_buildid}-routes
BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-werkzeug
BuildRequires: python%{_python_buildid}-tox
@@ -239,6 +241,7 @@ BuildRequires: py-bcrypt
%endif
%if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy
+BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-numpy-devel
@@ -408,7 +411,7 @@ This package contains Ceph benchmarks and test tools.
%endif
%endif
%prep
-%autosetup -p1 -n ceph-13.0.1-3204-g17e0216271
+%autosetup -p1 -n ceph-13.0.2-984-g852d3f1411
%build
@@ -757,6 +760,8 @@ rm -rf %{buildroot}%{_includedir}/rbd/features.h
rm -rf %{buildroot}%{_libdir}/librbd.so
rm -rf %{buildroot}%{_libdir}/librbd_tp.so
rm -rf %{buildroot}%{_libdir}/librgw.so.*
+rm -rf %{buildroot}%{_libdir}/librgw_op_tp.so*
+rm -rf %{buildroot}%{_libdir}/librgw_rados_tp.so*
rm -rf %{buildroot}%{_includedir}/rados/librgw.h
rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h
rm -rf %{buildroot}%{_libdir}/librgw.so
@@ -930,6 +935,8 @@ rm -rf %{buildroot}
%endif
%if %{with lttng}
%endif
+%if %{with lttng}
+%endif
%if 0%{with python2}
%endif
%if 0%{with python2}
diff --git a/ceph.changes b/ceph.changes
index 460ed4c..110f9ac 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
+
+- Update to 13.0.2-984-g852d3f1411:
+ + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4
+ + fixes s390x build failure (bsc#1089291)
+ + introduces liboath0 runtime dependency (bsc#1089302)
+ + fixes RGW SSL deployment
+
+-------------------------------------------------------------------
+Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com
+
+- Update to 13.0.2-819-gf64b021d4c:
+ + based on upstream master 3ab655b55d2b363c0352dfbb90caed2ffcd42432
+
+-------------------------------------------------------------------
+Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com
+
+- reduce ceph-test constraints for ppc64le and s390x
+
+-------------------------------------------------------------------
+Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de
+
+- Reduce ceph-test constraints on aarch64
+
-------------------------------------------------------------------
Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com
diff --git a/ceph.spec b/ceph.spec
index 6d2905d..03c2eeb 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 13.0.1.3204+g17e0216271
+Version: 13.0.2.984+g852d3f1411
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
@@ -139,6 +139,7 @@ BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
BuildRequires: libudev-devel
+BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libuuid-devel
@@ -218,6 +219,7 @@ BuildRequires: python3-Cython
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy
+BuildRequires: python%{_python_buildid}-routes
BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-werkzeug
BuildRequires: python%{_python_buildid}-tox
@@ -231,6 +233,7 @@ BuildRequires: py-bcrypt
%endif
%if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy
+BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-numpy-devel
@@ -362,6 +365,7 @@ Group: System/Filesystems
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
+Requires: python%{_python_buildid}-routes
Requires: python%{_python_buildid}-jinja2
Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-werkzeug
@@ -375,6 +379,7 @@ Requires: py-bcrypt
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy
+Requires: python%{_python_buildid}-Routes
Requires: python%{_python_buildid}-Jinja2
Requires: python%{_python_buildid}-Werkzeug
Requires: python%{_python_buildid}-pecan
@@ -739,7 +744,7 @@ Summary: Ceph benchmarks and test tools
%if 0%{?suse_version}
Group: System/Benchmark
%endif
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-common
Requires: xmlstarlet
Requires: jq
Requires: socat
@@ -840,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common
#################################################################################
%prep
-%autosetup -p1 -n ceph-13.0.1-3204-g17e0216271
+%autosetup -p1 -n ceph-13.0.2-984-g852d3f1411
%build
@@ -1657,6 +1662,10 @@ fi
%files -n librgw2
%{_libdir}/librgw.so.*
+%if %{with lttng}
+%{_libdir}/librgw_op_tp.so*
+%{_libdir}/librgw_rados_tp.so*
+%endif
%post -n librgw2 -p /sbin/ldconfig
diff --git a/checkin.sh b/checkin.sh
index 348b3b5..1016254 100644
--- a/checkin.sh
+++ b/checkin.sh
@@ -6,6 +6,8 @@
# git clone or repo+branch combination for the "ceph" package in OBS.
#
+set -x
+
BASEDIR=$(pwd)
function usage {