From ba6c1677a0edea9cc3183fd4f81886b139b08e315b7e90644ca48f6b3201443c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 31 May 2018 16:45:24 +0000 Subject: [PATCH] Accepting request 613329 from filesystems:ceph:mimic bsc#1084645 OBS-URL: https://build.opensuse.org/request/show/613329 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=187 --- ceph-13.1.1-173-g127c33d64e.tar.bz2 | 3 +++ ceph-14.0.0-123-g83acfb8fb6.tar.bz2 | 3 --- ceph-test.changes | 7 ++++--- ceph-test.spec | 11 ++++------- ceph.changes | 7 ++++--- ceph.spec | 11 ++++------- 6 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 ceph-13.1.1-173-g127c33d64e.tar.bz2 delete mode 100644 ceph-14.0.0-123-g83acfb8fb6.tar.bz2 diff --git a/ceph-13.1.1-173-g127c33d64e.tar.bz2 b/ceph-13.1.1-173-g127c33d64e.tar.bz2 new file mode 100644 index 0000000..4ae0acd --- /dev/null +++ b/ceph-13.1.1-173-g127c33d64e.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca28475f2a2fdbc533a85660dab578c3853e7240f6e3a88146cb741e37f22998 +size 72271947 diff --git a/ceph-14.0.0-123-g83acfb8fb6.tar.bz2 b/ceph-14.0.0-123-g83acfb8fb6.tar.bz2 deleted file mode 100644 index eedd8ae..0000000 --- a/ceph-14.0.0-123-g83acfb8fb6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a880a8f1760b6a08736e7736fbc45175b85494f3b67a7e9f04badf5527210cf1 -size 72559927 diff --git a/ceph-test.changes b/ceph-test.changes index e82031a..a1db4b1 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,10 +1,11 @@ ------------------------------------------------------------------- -Wed May 30 13:09:12 UTC 2018 - jan.fajerski@suse.com +Thu May 31 16:34:53 UTC 2018 - ncutler@suse.com -- Update to 14.0.0-123-g83acfb8fb6: - + based on upstream master f21df7672d4db80acaf782383ccaf474261d5886 +- Update to 13.1.1-173-g127c33d64e: + + based on upstream mimic dda69eea663bcabc5ad99f5ca8370f43575f475d * fix GCC8 builds (bsc#1084645) * fix python3 module loading (bsc#1086613) + * ceph-brag no longer packaged upstream ------------------------------------------------------------------- Thu Apr 26 21:27:17 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 69d43ad..640ccd8 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.0.123+g83acfb8fb6 +Version: 13.1.1.173+g127c33d64e 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-14.0.0-123-g83acfb8fb6.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.1.1-173-g127c33d64e.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-14.0.0-123-g83acfb8fb6 +%autosetup -p1 -n ceph-13.1.1-173-g127c33d64e %build @@ -470,6 +470,7 @@ cmake .. \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ + -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ @@ -638,7 +639,6 @@ rm -rf %{buildroot}%{_sbindir}/mount.ceph rm -rf %{buildroot}/sbin/mount.ceph rm -rf %{buildroot}%{_bindir}/rbd-replay-prep rm -rf %{buildroot}%{_bindir}/ceph-post-file -rm -rf %{buildroot}%{_bindir}/ceph-brag rm -rf %{buildroot}%{_tmpfilesdir}/ceph-common.conf rm -rf %{buildroot}%{_mandir}/man8/ceph-authtool.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-conf.8* @@ -758,14 +758,11 @@ 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_admin_user.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/librgw_admin_user.h rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h rm -rf %{buildroot}%{_libdir}/librgw.so -rm -rf %{buildroot}%{_libdir}/librgw_admin_user.so rm -rf %{buildroot}%{python_sitearch}/rgw.so rm -rf %{buildroot}%{python_sitearch}/rgw-*.egg-info rm -rf %{buildroot}%{python3_sitearch}/rgw.cpython*.so diff --git a/ceph.changes b/ceph.changes index e82031a..a1db4b1 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,10 +1,11 @@ ------------------------------------------------------------------- -Wed May 30 13:09:12 UTC 2018 - jan.fajerski@suse.com +Thu May 31 16:34:53 UTC 2018 - ncutler@suse.com -- Update to 14.0.0-123-g83acfb8fb6: - + based on upstream master f21df7672d4db80acaf782383ccaf474261d5886 +- Update to 13.1.1-173-g127c33d64e: + + based on upstream mimic dda69eea663bcabc5ad99f5ca8370f43575f475d * fix GCC8 builds (bsc#1084645) * fix python3 module loading (bsc#1086613) + * ceph-brag no longer packaged upstream ------------------------------------------------------------------- Thu Apr 26 21:27:17 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 3315a1e..95d455d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.0.123+g83acfb8fb6 +Version: 13.1.1.173+g127c33d64e 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-14.0.0-123-g83acfb8fb6.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.1.1-173-g127c33d64e.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -845,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.0-123-g83acfb8fb6 +%autosetup -p1 -n ceph-13.1.1-173-g127c33d64e %build @@ -904,6 +904,7 @@ cmake .. \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ + -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ @@ -1160,7 +1161,6 @@ fi %{_bindir}/rbd-replay-prep %endif %exclude %{_bindir}/ceph-post-file -%exclude %{_bindir}/ceph-brag %{_tmpfilesdir}/ceph-common.conf %{_mandir}/man8/ceph-authtool.8* %{_mandir}/man8/ceph-conf.8* @@ -1660,7 +1660,6 @@ fi %files -n librgw2 %{_libdir}/librgw.so.* -%{_libdir}/librgw_admin_user.so.* %if %{with lttng} %{_libdir}/librgw_op_tp.so* %{_libdir}/librgw_rados_tp.so* @@ -1673,10 +1672,8 @@ fi %files -n librgw-devel %dir %{_includedir}/rados %{_includedir}/rados/librgw.h -%{_includedir}/rados/librgw_admin_user.h %{_includedir}/rados/rgw_file.h %{_libdir}/librgw.so -%{_libdir}/librgw_admin_user.so %if 0%{with python2} %files -n python-rgw