rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 707782 from filesystems:ceph

Browse Source 
bsc#1136110 (forwarded request 707781 from smithfarm)

OBS-URL: https://build.opensuse.org/request/show/707782
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2019-06-12 11:07:13 +00:00 committed by Git OBS Bridge
commit 038d74de42
6 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.2.1-463-g99339b576a.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:394d4d4918580cd3c820e997f6236950298e394e4c6c3452c9d0f463a0282c95
size 95226289

3
ceph-14.2.1-468-g994fd9e0cc.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:610979d8eaf3afa6eca33b7b16663f6d7ce6a9ebc9ad79b522fb9a747969a075
size 95224915

16
ceph-test.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Jun 5 08:00:39 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-468-g994fd9e0cc:
+ spec:
* install grafana dashboards world readable (bsc#1136110)
* put "without python2" conditionals around python3-* provides/obsoletes
(align with upstream)
-------------------------------------------------------------------
Mon Jun 3 19:33:10 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-467-g9e10776aa2:
+ mon/Monitor: allow probe if MMonProbe::mon_release == 0 (bsc#1132396)
+ spec: make python3-rgw replace python-rgw on upgrade
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 10:22:35 UTC 2019 - Nathan Cutler <ncutler@suse.com> Fri May 31 10:22:35 UTC 2019 - Nathan Cutler <ncutler@suse.com>

14
ceph-test.spec
View File

@ -100,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.2.1.463+g99339b576a Version: 14.2.1.468+g994fd9e0cc
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -116,7 +116,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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-463-g99339b576a.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.2.1-468-g994fd9e0cc.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -426,12 +426,16 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{without python2}
%endif
%if 0%{with python2} %if 0%{with python2}
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{without python2}
%endif
%if 0%{with libradosstriper} %if 0%{with libradosstriper}
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
@ -452,6 +456,8 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{without python2}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
@ -464,6 +470,8 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{without python2}
%endif
%if 0%{with python2} %if 0%{with python2}
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
@ -499,7 +507,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-14.2.1-463-g99339b576a %autosetup -p1 -n ceph-14.2.1-468-g994fd9e0cc
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # LTO can be enabled as soon as the following GCC bug is fixed:

16
ceph.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Jun 5 08:00:39 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-468-g994fd9e0cc:
+ spec:
* install grafana dashboards world readable (bsc#1136110)
* put "without python2" conditionals around python3-* provides/obsoletes
(align with upstream)
-------------------------------------------------------------------
Mon Jun 3 19:33:10 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-467-g9e10776aa2:
+ mon/Monitor: allow probe if MMonProbe::mon_release == 0 (bsc#1132396)
+ spec: make python3-rgw replace python-rgw on upgrade
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 10:22:35 UTC 2019 - Nathan Cutler <ncutler@suse.com> Fri May 31 10:22:35 UTC 2019 - Nathan Cutler <ncutler@suse.com>

22
ceph.spec
View File

@ -100,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 14.2.1.463+g99339b576a Version: 14.2.1.468+g994fd9e0cc
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -116,7 +116,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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-463-g99339b576a.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.2.1-468-g994fd9e0cc.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -722,6 +722,10 @@ Group: Development/Libraries/Python
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rgw = %{_epoch_prefix}%{version}-%{release} Provides: python3-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{without python2}
Provides: python-rgw = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rgw < %{_epoch_prefix}%{version}-%{release}
%endif
%description -n python%{python3_pkgversion}-rgw %description -n python%{python3_pkgversion}-rgw
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
gateway. gateway.
@ -747,8 +751,10 @@ Group: Development/Libraries/Python
Requires: python%{python3_pkgversion} Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rados = %{_epoch_prefix}%{version}-%{release} Provides: python3-rados = %{_epoch_prefix}%{version}-%{release}
%if 0%{without python2}
Provides: python-rados = %{_epoch_prefix}%{version}-%{release} Provides: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release} Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release}
%endif
%description -n python%{python3_pkgversion}-rados %description -n python%{python3_pkgversion}-rados
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
object store. object store.
@ -836,8 +842,10 @@ Group: Development/Libraries/Python
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release} Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release}
%if 0%{without python2}
Provides: python-rbd = %{_epoch_prefix}%{version}-%{release} Provides: python-rbd = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release} Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release}
%endif
%description -n python%{python3_pkgversion}-rbd %description -n python%{python3_pkgversion}-rbd
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
block device. block device.
@ -896,8 +904,10 @@ Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
Provides: python3-cephfs = %{_epoch_prefix}%{version}-%{release} Provides: python3-cephfs = %{_epoch_prefix}%{version}-%{release}
%if 0%{without python2}
Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release} Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release} Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
%endif
%description -n python%{python3_pkgversion}-cephfs %description -n python%{python3_pkgversion}-cephfs
This package contains Python 3 libraries for interacting with Cephs distributed This package contains Python 3 libraries for interacting with Cephs distributed
file system. file system.
@ -1068,7 +1078,7 @@ This package provides Ceph’s default alerts for Prometheus.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-14.2.1-463-g99339b576a %autosetup -p1 -n ceph-14.2.1-468-g994fd9e0cc
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # LTO can be enabled as soon as the following GCC bug is fixed:
@ -2205,9 +2215,9 @@ exit 0
%files grafana-dashboards %files grafana-dashboards
%if 0%{?suse_version} %if 0%{?suse_version}
%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana %attr(0755,root,root) %dir %{_sysconfdir}/grafana
%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards
%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
%else %else
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
%endif %endif