Hello community, here is the log from the commit of package ceph for openSUSE:Leap:15.2 checked in at 2020-02-25 12:16:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ceph (Old) and /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Tue Feb 25 12:16:37 2020 rev:70 rq:775314 version:15.1.0.818+g5f8ed0e957 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ceph/ceph-test.changes 2020-02-16 18:25:58.770644467 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092/ceph-test.changes 2020-02-25 12:16:42.224372858 +0100 @@ -1,0 +2,14 @@ +Mon Feb 17 16:08:29 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.1.0-818-g5f8ed0e957: + + rebase on tip of upstream master, SHA1 eb72aebb92f1bfce00aedaebf140789871eb943f + * includes "mgr/orch: new cli, phase 2" patches (PR#33244) needed + by latest ceph-bootstrap + +------------------------------------------------------------------- +Thu Feb 13 13:45:52 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.1.0-636-g2280954009: + + rebase on tip of upstream master, SHA1 e36d47a8c3f4181d68a4cd680bdde72064dee910 + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-15.1.0-168-gfda88e35c8.tar.bz2 New: ---- ceph-15.1.0-818-g5f8ed0e957.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.ELAOvM/_old 2020-02-25 12:16:44.696377981 +0100 +++ /var/tmp/diff_new_pack.ELAOvM/_new 2020-02-25 12:16:44.700377989 +0100 @@ -21,6 +21,7 @@ # bcond syntax! ################################################################################# %bcond_with make_check +%bcond_with cmake_verbose_logging %bcond_without ceph_test_package %bcond_with minimal_debugging_information %ifarch s390 s390x @@ -72,13 +73,13 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif -%if 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif %if %{with selinux} # get selinux policy version # Force 0.0.0 policy version for centos builds to avoid repository sync issues between rhel and centos -%if %{?centos} +%if 0%{?centos} %global _selinux_policy_version 0.0.0 %else %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} @@ -103,7 +104,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.1.0.168+gfda88e35c8 +Version: 15.1.0.818+g5f8ed0e957 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -119,7 +120,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.1.0-168-gfda88e35c8.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.1.0-818-g5f8ed0e957.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -210,18 +211,29 @@ %if 0%{with make_check} BuildRequires: jq BuildRequires: libuuid-devel +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-bcrypt +BuildRequires: python%{python3_version_nodots}-nose +%else BuildRequires: python%{python3_pkgversion}-bcrypt BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-pecan +%endif BuildRequires: python%{python3_pkgversion}-requests +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-six +BuildRequires: python%{python3_version_nodots}-virtualenv +%else BuildRequires: python%{python3_pkgversion}-six BuildRequires: python%{python3_pkgversion}-virtualenv -%if 0%{?rhel} < 8 +%endif +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-coverage +%else BuildRequires: python%{python3_pkgversion}-coverage -BuildRequires: python%{python3_pkgversion}-tox %endif %if 0%{?rhel} == 7 -BuildRequires: pyOpenSSL%{python3_pkgversion} +BuildRequires: python%{python3_version_nodots}-pyOpenSSL %else BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif @@ -300,13 +312,22 @@ %endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-jwt +BuildRequires: python%{python3_version_nodots}-scipy +%else BuildRequires: python%{python3_pkgversion}-cherrypy BuildRequires: python%{python3_pkgversion}-jwt BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug +%endif +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-pyOpenSSL +%else BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif +%endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 @@ -372,6 +393,8 @@ %endif %if 0%{?weak_deps} %endif +%if 0%{?weak_deps} +%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} @@ -519,7 +542,7 @@ %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-15.1.0-168-gfda88e35c8 +%autosetup -p1 -n ceph-15.1.0-818-g5f8ed0e957 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -637,9 +660,17 @@ %else -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ %endif +%if 0%{with cmake_verbose_logging} + -DCMAKE_VERBOSE_MAKEFILE=ON \ +%endif -DBOOST_J=$CEPH_SMP_NCPUS \ -DWITH_GRAFANA=ON +%if %{with cmake_verbose_logging} +cat ./CMakeFiles/CMakeOutput.log +cat ./CMakeFiles/CMakeError.log +%endif + make "$CEPH_MFLAGS_JOBS" @@ -817,10 +848,8 @@ rm -rf %{buildroot}%{_unitdir}/ceph-mds.target rm -rf %{buildroot}%{_bindir}/ceph-mgr rm -rf %{buildroot}%{_datadir}/ceph/mgr/alerts -rm -rf %{buildroot}%{_datadir}/ceph/mgr/ansible rm -rf %{buildroot}%{_datadir}/ceph/mgr/balancer rm -rf %{buildroot}%{_datadir}/ceph/mgr/crash -rm -rf %{buildroot}%{_datadir}/ceph/mgr/deepsea rm -rf %{buildroot}%{_datadir}/ceph/mgr/devicehealth rm -rf %{buildroot}%{_datadir}/ceph/mgr/influx rm -rf %{buildroot}%{_datadir}/ceph/mgr/insights ++++++ ceph.spec ++++++ --- /var/tmp/diff_new_pack.ELAOvM/_old 2020-02-25 12:16:44.712378013 +0100 +++ /var/tmp/diff_new_pack.ELAOvM/_new 2020-02-25 12:16:44.716378023 +0100 @@ -21,6 +21,7 @@ # bcond syntax! ################################################################################# %bcond_with make_check +%bcond_with cmake_verbose_logging %bcond_with ceph_test_package %bcond_with minimal_debugging_information %ifarch s390 s390x @@ -72,13 +73,13 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif -%if 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif %if %{with selinux} # get selinux policy version # Force 0.0.0 policy version for centos builds to avoid repository sync issues between rhel and centos -%if %{?centos} +%if 0%{?centos} %global _selinux_policy_version 0.0.0 %else %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} @@ -103,7 +104,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.1.0.168+gfda88e35c8 +Version: 15.1.0.818+g5f8ed0e957 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -119,7 +120,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.1.0-168-gfda88e35c8.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.1.0-818-g5f8ed0e957.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -202,18 +203,29 @@ %if 0%{with make_check} BuildRequires: jq BuildRequires: libuuid-devel +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-bcrypt +BuildRequires: python%{python3_version_nodots}-nose +%else BuildRequires: python%{python3_pkgversion}-bcrypt BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-pecan +%endif BuildRequires: python%{python3_pkgversion}-requests +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-six +BuildRequires: python%{python3_version_nodots}-virtualenv +%else BuildRequires: python%{python3_pkgversion}-six BuildRequires: python%{python3_pkgversion}-virtualenv -%if 0%{?rhel} < 8 +%endif +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-coverage +%else BuildRequires: python%{python3_pkgversion}-coverage -BuildRequires: python%{python3_pkgversion}-tox %endif %if 0%{?rhel} == 7 -BuildRequires: pyOpenSSL%{python3_pkgversion} +BuildRequires: python%{python3_version_nodots}-pyOpenSSL %else BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif @@ -292,13 +304,22 @@ %endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-jwt +BuildRequires: python%{python3_version_nodots}-scipy +%else BuildRequires: python%{python3_pkgversion}-cherrypy BuildRequires: python%{python3_pkgversion}-jwt BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug +%endif +%if 0%{?rhel} == 7 +BuildRequires: python%{python3_version_nodots}-pyOpenSSL +%else BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif +%endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 @@ -396,9 +417,11 @@ %package -n cephadm Summary: Utility to bootstrap Ceph clusters -Requires: podman Requires: lvm2 Requires: python%{python3_pkgversion} +%if 0%{?weak_deps} +Recommends: podman +%endif %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed with systemd and podman. @@ -569,6 +592,7 @@ %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-kubernetes +Requires: python%{python3_pkgversion}-jsonpatch %description mgr-rook ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using a Rook backend. @@ -1076,7 +1100,7 @@ # common ################################################################################# %prep -%autosetup -p1 -n ceph-15.1.0-168-gfda88e35c8 +%autosetup -p1 -n ceph-15.1.0-818-g5f8ed0e957 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1194,9 +1218,17 @@ %else -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ %endif +%if 0%{with cmake_verbose_logging} + -DCMAKE_VERBOSE_MAKEFILE=ON \ +%endif -DBOOST_J=$CEPH_SMP_NCPUS \ -DWITH_GRAFANA=ON +%if %{with cmake_verbose_logging} +cat ./CMakeFiles/CMakeOutput.log +cat ./CMakeFiles/CMakeError.log +%endif + make "$CEPH_MFLAGS_JOBS" @@ -1555,10 +1587,8 @@ %{_bindir}/ceph-mgr %dir %{_datadir}/ceph/mgr %{_datadir}/ceph/mgr/alerts -%{_datadir}/ceph/mgr/ansible %{_datadir}/ceph/mgr/balancer %{_datadir}/ceph/mgr/crash -%{_datadir}/ceph/mgr/deepsea %{_datadir}/ceph/mgr/devicehealth %{_datadir}/ceph/mgr/influx %{_datadir}/ceph/mgr/insights ++++++ ceph-15.1.0-168-gfda88e35c8.tar.bz2 -> ceph-15.1.0-818-g5f8ed0e957.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/ceph/ceph-15.1.0-168-gfda88e35c8.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092/ceph-15.1.0-818-g5f8ed0e957.tar.bz2 differ: char 11, line 1
