diff --git a/_servicedata b/_servicedata
index f657e13..45ef269 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
git://github.com/SUSE/ceph.git
- 8999301960b4c63ede52961ed21da5e57cfc06bd
\ No newline at end of file
+ a17726c4326ee895bf40686e3340c04c6963c153
\ No newline at end of file
diff --git a/ceph-11.0.0+git.1472202104.8999301.tar.bz2 b/ceph-11.0.0+git.1472202104.8999301.tar.bz2
deleted file mode 100644
index 80d0f1d..0000000
--- a/ceph-11.0.0+git.1472202104.8999301.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab54240d6d8f0337a07fe4946f3ed08f4e73439339cd9caf4a569a8497955a1d
-size 17501676
diff --git a/ceph-11.0.0+git.1472455009.a17726c.tar.bz2 b/ceph-11.0.0+git.1472455009.a17726c.tar.bz2
new file mode 100644
index 0000000..8a084d4
--- /dev/null
+++ b/ceph-11.0.0+git.1472455009.a17726c.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2b78dfb0da332f53f848d774aea562854e5e6d25f6f2f8bc0316ddd6f86b3fe
+size 17530394
diff --git a/ceph-test.changes b/ceph-test.changes
index bbdea6b..c376bb6 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Mon Aug 29 07:24:44 UTC 2016 - ncutler@suse.com
+
+- pre_checkin.sh: add Source line for ceph-rpmlintrc
+- move Source line for ceph-rpmlintrc from ceph.spec to ceph-test.spec
+ (see https://github.com/SUSE/ceph/pull/60 for rationale)
+
+-------------------------------------------------------------------
+Mon Aug 29 07:20:00 UTC 2016 - ncutler@suse.com
+
+- Update to version 11.0.0+git.1472455009.a17726c:
+ + ceph.spec.in: drop ceph-rpmlintrc source line
+ + ceph.spec.in: drop epoch prefixes
+
+-------------------------------------------------------------------
+Sun Aug 28 11:48:42 UTC 2016 - ncutler@suse.com
+
+- Update to version 11.0.0+git.1472384770.c9f3af8:
+ + test/rgw: add --gateways-per-zone to test_multi.py
+ + rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
+ + rgw: RGWCoroutinesManager::run returns status of last cr
+ + os/bluestore: fix whitespace in bitset apply helper
+ + cmake: do not link secret.c if not necessary
+ + cmake: do not link against keyutils if not necessary
+ + os/bluestore: fsck on mkfs (on by default)
+ + os/bluestore: ensure block device size is a multiple of the block size
+ + Revert "ceph.spec.in: don't try to package __pycache__ for SUSE"
+ + rpm: force creation of Python 3 __pycache__ on SUSE
+ + doc: add v0.94.7 changelog
+ + doc: add v0.94.8 changelog
+ + doc/releases: add v0.94.8 to timeline
+ + doc/release-notes: fix v10.2.2 changelog link
+ + unittest_bluefs: fix block device sizes
+ + doc: do not list all major versions in get-packages.rst
+ + doc: add missing PR to hammer 0.94.8 release notes
+ + doc: release-notes.rst: move misplaced line
+ + doc: fix two broken links in releases.rst
+ + doc: add 11.0.0 to releases table
+
-------------------------------------------------------------------
Sun Aug 28 10:55:04 UTC 2016 - ncutler@suse.com
diff --git a/ceph-test.spec b/ceph-test.spec
index dea8178..01eaf27 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -66,7 +66,7 @@
# common
#################################################################################
Name: ceph-test
-Version: 11.0.0+git.1472202104.8999301
+Version: 11.0.0+git.1472455009.a17726c
Release: 0
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -78,6 +78,7 @@ Source0: ceph-%{version}.tar.bz2
Source97: ceph_ver_hack.sh
Source98: README-ceph-test.txt
Source99: ceph-rpmlintrc
+# _insert_obs_source_lines_here
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@@ -404,6 +405,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
+%if 0%{?suse_version}
+# create __pycache__ directories and their contents
+%py3_compile %{buildroot}%{python3_sitelib}
+%endif
+
rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf
rm -rf %{buildroot}%{_docdir}/ceph/sample.fetch_config
rm -rf %{buildroot}%{_bindir}/crushtool
@@ -579,8 +585,8 @@ rm -rf %{buildroot}%{python3_sitearch}/cephfs-*.egg-info
rm -rf %{buildroot}%{python3_sitelib}/ceph_volume_client.py
rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
rm -rf %{buildroot}%{python3_sitelib}/ceph_argparse.py
-rm -rf %{buildroot}%{python3_sitelib}/ceph_daemon.py
rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
+rm -rf %{buildroot}%{python3_sitelib}/ceph_daemon.py
rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so.*
rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so
@@ -706,10 +712,6 @@ rm -rf %{buildroot}
%endif
%if %{with lttng}
%endif
-%if ! 0%{?suse_version}
-%endif
-%if ! 0%{?suse_version}
-%endif
%if 0%{with ceph_test_package}
%files -n ceph-test
%defattr(-,root,root,-)
diff --git a/ceph.changes b/ceph.changes
index bbdea6b..c376bb6 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Mon Aug 29 07:24:44 UTC 2016 - ncutler@suse.com
+
+- pre_checkin.sh: add Source line for ceph-rpmlintrc
+- move Source line for ceph-rpmlintrc from ceph.spec to ceph-test.spec
+ (see https://github.com/SUSE/ceph/pull/60 for rationale)
+
+-------------------------------------------------------------------
+Mon Aug 29 07:20:00 UTC 2016 - ncutler@suse.com
+
+- Update to version 11.0.0+git.1472455009.a17726c:
+ + ceph.spec.in: drop ceph-rpmlintrc source line
+ + ceph.spec.in: drop epoch prefixes
+
+-------------------------------------------------------------------
+Sun Aug 28 11:48:42 UTC 2016 - ncutler@suse.com
+
+- Update to version 11.0.0+git.1472384770.c9f3af8:
+ + test/rgw: add --gateways-per-zone to test_multi.py
+ + rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
+ + rgw: RGWCoroutinesManager::run returns status of last cr
+ + os/bluestore: fix whitespace in bitset apply helper
+ + cmake: do not link secret.c if not necessary
+ + cmake: do not link against keyutils if not necessary
+ + os/bluestore: fsck on mkfs (on by default)
+ + os/bluestore: ensure block device size is a multiple of the block size
+ + Revert "ceph.spec.in: don't try to package __pycache__ for SUSE"
+ + rpm: force creation of Python 3 __pycache__ on SUSE
+ + doc: add v0.94.7 changelog
+ + doc: add v0.94.8 changelog
+ + doc/releases: add v0.94.8 to timeline
+ + doc/release-notes: fix v10.2.2 changelog link
+ + unittest_bluefs: fix block device sizes
+ + doc: do not list all major versions in get-packages.rst
+ + doc: add missing PR to hammer 0.94.8 release notes
+ + doc: release-notes.rst: move misplaced line
+ + doc: fix two broken links in releases.rst
+ + doc: add 11.0.0 to releases table
+
-------------------------------------------------------------------
Sun Aug 28 10:55:04 UTC 2016 - ncutler@suse.com
diff --git a/ceph.spec b/ceph.spec
index 764f1a3..1ba4254 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -66,7 +66,7 @@
# common
#################################################################################
Name: ceph
-Version: 11.0.0+git.1472202104.8999301
+Version: 11.0.0+git.1472455009.a17726c
Release: 0
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -75,7 +75,7 @@ Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{name}-%{version}.tar.bz2
-Source99: ceph-rpmlintrc
+# _insert_obs_source_lines_here
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@@ -438,7 +438,7 @@ Summary: Python 3 libraries for the RADOS object store
Group: System Environment/Libraries
License: LGPL-2.0
Requires: python%{python3_pkgversion}
-Requires: librados2 = %{epoch}:%{version}-%{release}
+Requires: librados2 = %{version}-%{release}
%description -n python%{python3_pkgversion}-rados
This package contains Python 3 libraries for interacting with Cephs RADOS
object store.
@@ -508,8 +508,8 @@ block device.
Summary: Python 3 libraries for the RADOS block device
Group: System Environment/Libraries
License: LGPL-2.0
-Requires: librbd1 = %{epoch}:%{version}-%{release}
-Requires: python%{python3_pkgversion}-rados = %{epoch}:%{version}-%{release}
+Requires: librbd1 = %{version}-%{release}
+Requires: python%{python3_pkgversion}-rados = %{version}-%{release}
%description -n python%{python3_pkgversion}-rbd
This package contains Python 3 libraries for interacting with Cephs RADOS
block device.
@@ -556,8 +556,8 @@ file system.
Summary: Python 3 libraries for Ceph distributed file system
Group: System Environment/Libraries
License: LGPL-2.0
-Requires: libcephfs1 = %{epoch}:%{version}-%{release}
-Requires: python%{python3_pkgversion}-rados = %{epoch}:%{version}-%{release}
+Requires: libcephfs1 = %{version}-%{release}
+Requires: python%{python3_pkgversion}-rados = %{version}-%{release}
%description -n python%{python3_pkgversion}-cephfs
This package contains Python 3 libraries for interacting with Cephs distributed
file system.
@@ -642,9 +642,9 @@ Summary: Compatibility package for Cephs python libraries
Group: System Environment/Libraries
License: LGPL-2.0
Obsoletes: python-ceph
-Requires: python-rados = %{epoch}:%{version}-%{release}
-Requires: python-rbd = %{epoch}:%{version}-%{release}
-Requires: python-cephfs = %{epoch}:%{version}-%{release}
+Requires: python-rados = %{version}-%{release}
+Requires: python-rbd = %{version}-%{release}
+Requires: python-cephfs = %{version}-%{release}
Provides: python-ceph
%description -n python-ceph-compat
This is a compatibility package to accommodate python-ceph split into
@@ -804,6 +804,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
+%if 0%{?suse_version}
+# create __pycache__ directories and their contents
+%py3_compile %{buildroot}%{python3_sitelib}
+%endif
+
%clean
rm -rf %{buildroot}
@@ -1433,18 +1438,14 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
%{python3_sitearch}/cephfs.cpython*.so
%{python3_sitearch}/cephfs-*.egg-info
%{python3_sitelib}/ceph_volume_client.py
-%if ! 0%{?suse_version}
%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
-%endif
%files -n python%{python3_pkgversion}-ceph-argparse
%defattr(-,root,root,-)
%{python3_sitelib}/ceph_argparse.py
-%{python3_sitelib}/ceph_daemon.py
-%if ! 0%{?suse_version}
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
+%{python3_sitelib}/ceph_daemon.py
%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
-%endif
%if 0%{with ceph_test_package}
%files -n ceph-test
diff --git a/pre_checkin.sh b/pre_checkin.sh
index f91ab7f..278a6a0 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -282,6 +282,7 @@ summ=`get_package_summary $SPEC_FILE $PACKAGE`
desc=`get_package_description $SPEC_FILE $PACKAGE`
reqs=`get_package_requires $SPEC_FILE $PACKAGE`
transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec
+insert_line_before "${PACKAGE}.spec" "Source99: ceph-rpmlintrc" "_insert_obs_source_lines_here"
insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:"
insert_line_before "${PACKAGE}.spec" "Source97: ceph_ver_hack.sh" "^Source98:"
copy_changes_file $PACKAGE