Hello community, here is the log from the commit of package ceph for openSUSE:Leap:15.2 checked in at 2020-02-16 18:25:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ceph (Old) and /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph" Sun Feb 16 18:25:54 2020 rev:69 rq:772171 version:15.1.0.168+gfda88e35c8 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ceph/ceph-test.changes 2020-01-15 14:49:44.421390388 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092/ceph-test.changes 2020-02-16 18:25:58.770644467 +0100 @@ -1,0 +2,37 @@ +Mon Feb 3 14:59:02 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.1.0-168-gfda88e35c8: + + rebase on tip of upstream master, SHA1 80487f4a604da94778e65f666e1177a3ed84543e + + spec: Use pkgconfig() style BuildRequires for udev/libudev-devel + +------------------------------------------------------------------- +Thu Jan 30 13:08:38 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.0.0-10092-gb5fd1b8250: + + rebase on tip of upstream master, SHA1 3913835a8f0b9b34ceffd4dc02e1e8203227be02 + +------------------------------------------------------------------- +Thu Jan 23 12:45:20 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.0.0-9544-gefdea72067: + + cmake: Improve test for 16-byte atomic support on IBM Z (bsc#1161688) + +------------------------------------------------------------------- +Tue Jan 21 11:09:45 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.0.0-9543-g1c7fc80ba1: + + rebase on tip of upstream master, SHA1 089e97c27013612672099281fad76746f19290e3 + +------------------------------------------------------------------- +Mon Jan 20 16:03:16 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.0.0-9494-g22cdfe7b96: + + rebase on tip of upstream master, SHA1 26c66630bd98dfce113f66ab4e081e5a7b0216c0 + +------------------------------------------------------------------- +Tue Jan 7 17:49:34 UTC 2020 - Nathan Cutler <[email protected]> + +- Update to 15.0.0-9092-gd050bc3f0a: + + rebase on tip of upstream master, SHA1 dfd90da59c0b2eda9ca61fed1d508ddc2ab32a2b + +------------------------------------------------------------------- ceph.changes: same change Old: ---- ceph-15.0.0-8683-gb78b3635a5.tar.bz2 New: ---- ceph-15.1.0-168-gfda88e35c8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-test.spec ++++++ --- /var/tmp/diff_new_pack.hBVOsS/_old 2020-02-16 18:26:00.454645349 +0100 +++ /var/tmp/diff_new_pack.hBVOsS/_new 2020-02-16 18:26:00.458645351 +0100 @@ -77,15 +77,22 @@ %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} +%global _selinux_policy_version 0.0.0 +%else %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} %endif +%endif %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} - +%if 0%{?rhel} == 7 +%define __python %{__python3} +%endif # unify libexec for all targets %global _libexecdir %{_exec_prefix}/lib @@ -96,7 +103,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.0.0.8683+gb78b3635a5 +Version: 15.1.0.168+gfda88e35c8 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +119,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.0.0-8683-gb78b3635a5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.1.0-168-gfda88e35c8.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -170,7 +177,7 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libcap-ng-devel -BuildRequires: libudev-devel +BuildRequires: pkgconfig(libudev) BuildRequires: libnl3-devel BuildRequires: liboath-devel BuildRequires: libtool @@ -186,7 +193,7 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: snappy-devel BuildRequires: sudo -BuildRequires: udev +BuildRequires: pkgconfig(udev) BuildRequires: util-linux BuildRequires: valgrind-devel BuildRequires: which @@ -205,12 +212,12 @@ BuildRequires: libuuid-devel BuildRequires: python%{python3_pkgversion}-bcrypt BuildRequires: python%{python3_pkgversion}-nose +BuildRequires: python%{python3_pkgversion}-pecan BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-six BuildRequires: python%{python3_pkgversion}-virtualenv %if 0%{?rhel} < 8 BuildRequires: python%{python3_pkgversion}-coverage -BuildRequires: python%{python3_pkgversion}-pecan BuildRequires: python%{python3_pkgversion}-tox %endif %if 0%{?rhel} == 7 @@ -285,20 +292,21 @@ # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} -%if 0%{?fedora} || 0%{?rhel} == 7 BuildRequires: libtool-ltdl-devel -BuildRequires: python%{python3_pkgversion}-cherrypy -BuildRequires: python%{python3_pkgversion}-jwt -BuildRequires: python%{python3_pkgversion}-routes -BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel +%ifarch x86_64 BuildRequires: xmlsec1-nss +%endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +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 BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif -%endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 @@ -400,6 +408,8 @@ %endif %if 0%{?suse_version} %endif +%if 0%{without python2} +%endif %if 0%{?suse_version} %endif %if 0%{?suse_version} @@ -509,7 +519,7 @@ %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-15.0.0-8683-gb78b3635a5 +%autosetup -p1 -n ceph-15.1.0-168-gfda88e35c8 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -833,6 +843,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/mgr/test_orchestrator rm -rf %{buildroot}%{_datadir}/ceph/mgr/volumes rm -rf %{buildroot}%{_datadir}/ceph/mgr/zabbix +rm -rf %{buildroot}%{_datadir}/ceph/mgr/__pycache__ rm -rf %{buildroot}%{_unitdir}/[email protected] rm -rf %{buildroot}%{_unitdir}/ceph-mgr.target rm -rf %{buildroot}%{_datadir}/ceph/mgr/dashboard @@ -867,6 +878,7 @@ rm -rf %{buildroot}%{_bindir}/radosgw-token rm -rf %{buildroot}%{_bindir}/radosgw-es rm -rf %{buildroot}%{_bindir}/radosgw-object-expirer +rm -rf %{buildroot}%{_libdir}/libradosgw.so* rm -rf %{buildroot}%{_mandir}/man8/radosgw.8* rm -rf %{buildroot}%{_unitdir}/[email protected] rm -rf %{buildroot}%{_unitdir}/ceph-radosgw.target @@ -1022,6 +1034,8 @@ %endif %if 0%{?fedora} || 0%{?rhel} %endif +%if 0%{?rhel} == 7 +%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} ++++++ ceph.spec ++++++ --- /var/tmp/diff_new_pack.hBVOsS/_old 2020-02-16 18:26:00.474645359 +0100 +++ /var/tmp/diff_new_pack.hBVOsS/_new 2020-02-16 18:26:00.474645359 +0100 @@ -77,15 +77,22 @@ %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} +%global _selinux_policy_version 0.0.0 +%else %{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0} %endif +%endif %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} - +%if 0%{?rhel} == 7 +%define __python %{__python3} +%endif # unify libexec for all targets %global _libexecdir %{_exec_prefix}/lib @@ -96,7 +103,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.0.0.8683+gb78b3635a5 +Version: 15.1.0.168+gfda88e35c8 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +119,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-15.0.0-8683-gb78b3635a5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.1.0-168-gfda88e35c8.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -162,7 +169,7 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libcap-ng-devel -BuildRequires: libudev-devel +BuildRequires: pkgconfig(libudev) BuildRequires: libnl3-devel BuildRequires: liboath-devel BuildRequires: libtool @@ -178,7 +185,7 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: snappy-devel BuildRequires: sudo -BuildRequires: udev +BuildRequires: pkgconfig(udev) BuildRequires: util-linux BuildRequires: valgrind-devel BuildRequires: which @@ -197,12 +204,12 @@ BuildRequires: libuuid-devel BuildRequires: python%{python3_pkgversion}-bcrypt BuildRequires: python%{python3_pkgversion}-nose +BuildRequires: python%{python3_pkgversion}-pecan BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-six BuildRequires: python%{python3_pkgversion}-virtualenv %if 0%{?rhel} < 8 BuildRequires: python%{python3_pkgversion}-coverage -BuildRequires: python%{python3_pkgversion}-pecan BuildRequires: python%{python3_pkgversion}-tox %endif %if 0%{?rhel} == 7 @@ -277,20 +284,21 @@ # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} -%if 0%{?fedora} || 0%{?rhel} == 7 BuildRequires: libtool-ltdl-devel -BuildRequires: python%{python3_pkgversion}-cherrypy -BuildRequires: python%{python3_pkgversion}-jwt -BuildRequires: python%{python3_pkgversion}-routes -BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel +%ifarch x86_64 BuildRequires: xmlsec1-nss +%endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +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 BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif -%endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 @@ -390,6 +398,7 @@ Summary: Utility to bootstrap Ceph clusters Requires: podman Requires: lvm2 +Requires: python%{python3_pkgversion} %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed with systemd and podman. @@ -541,6 +550,13 @@ Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} +%if 0%{without python2} +Requires: python3-grpcio +Requires: python3-protobuf +%else +Requires: python2-grpcio +Requires: python2-protobuf +%endif %description mgr-diskprediction-cloud ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict disk failures using services in the Google cloud. @@ -1060,7 +1076,7 @@ # common ################################################################################# %prep -%autosetup -p1 -n ceph-15.0.0-8683-gb78b3635a5 +%autosetup -p1 -n ceph-15.1.0-168-gfda88e35c8 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1565,6 +1581,9 @@ %{_datadir}/ceph/mgr/test_orchestrator %{_datadir}/ceph/mgr/volumes %{_datadir}/ceph/mgr/zabbix +%if 0%{?rhel} == 7 +%{_datadir}/ceph/mgr/__pycache__ +%endif %{_unitdir}/[email protected] %{_unitdir}/ceph-mgr.target %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr @@ -1852,12 +1871,14 @@ %{_bindir}/radosgw-token %{_bindir}/radosgw-es %{_bindir}/radosgw-object-expirer +%{_libdir}/libradosgw.so* %{_mandir}/man8/radosgw.8* %dir %{_localstatedir}/lib/ceph/radosgw %{_unitdir}/[email protected] %{_unitdir}/ceph-radosgw.target %post radosgw +/sbin/ldconfig %if 0%{?suse_version} if [ $1 -eq 1 ] ; then /usr/bin/systemctl preset ceph-radosgw@\*.service ceph-radosgw.target >/dev/null 2>&1 || : @@ -1879,6 +1900,7 @@ %endif %postun radosgw +/sbin/ldconfig %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-radosgw@\*.service ceph-radosgw.target ++++++ ceph-15.0.0-8683-gb78b3635a5.tar.bz2 -> ceph-15.1.0-168-gfda88e35c8.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/ceph/ceph-15.0.0-8683-gb78b3635a5.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.ceph.new.26092/ceph-15.1.0-168-gfda88e35c8.tar.bz2 differ: char 11, line 1 ++++++ checkin.sh ++++++ --- /var/tmp/diff_new_pack.hBVOsS/_old 2020-02-16 18:26:00.542645395 +0100 +++ /var/tmp/diff_new_pack.hBVOsS/_new 2020-02-16 18:26:00.542645395 +0100 @@ -92,7 +92,7 @@ # TMPDIR=$(mktemp -d --tmpdir=$BASEDIR) # does not work due to http://tracker.ceph.com/issues/39556 TMPDIR=$(mktemp -d) echo "Created temporary temporary $TMPDIR" - git clone --branch $BRANCH $REPO $TMPDIR + git clone --progress --branch $BRANCH $REPO $TMPDIR CLONE="$TMPDIR" fi _check_ceph_clone "$CLONE"
