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

Accepting request 653897 from filesystems:ceph:nautilus

Browse Source 
14.0.1-1547

OBS-URL: https://build.opensuse.org/request/show/653897
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=198
This commit is contained in:
Nathan Cutler 2018-12-04 16:52:06 +00:00 committed by Git OBS Bridge
parent dafb93e213
commit 54ea9100ee
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.0.1-1545-g01bead277f.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fcd0142c5d733ffe9710d63456346dc54360fcdf27587efb6d6ae21ec7e24b9
size 95394334

3
ceph-14.0.1-1547-g08fca371b5.tar.bz2 Normal file
View File

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

9
ceph-test.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 3 16:24:29 UTC 2018 - ncutler@suse.com
- Update to v14.0.1-1547-g08fca371b5:
+ mgr/volumes: Fix Python 3 import error
(fixes cluster deployment in py3 environment)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com
@ -12,7 +19,7 @@ Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com
- spec file: make ceph-common provide/obsolete libradosstriper1 - spec file: make ceph-common obsolete libradosstriper1
(in SES5 ceph-common requires libradosstriper1 with exact version match, (in SES5 ceph-common requires libradosstriper1 with exact version match,
while in SES6 there is no libradosstriper1 at all) while in SES6 there is no libradosstriper1 at all)

8
ceph-test.spec
View File

@ -96,7 +96,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.0.1.1545+g01bead277f Version: 14.0.1.1547+g08fca371b5
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -112,7 +112,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.0.1-1545-g01bead277f.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1547-g08fca371b5.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -468,7 +468,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.0.1-1545-g01bead277f %autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5
%build %build
@ -1052,5 +1052,7 @@ rm -rf %{buildroot}
%endif # with selinux %endif # with selinux
%if 0%{with python2} %if 0%{with python2}
%endif %endif
%if 0%{?suse_version}
%endif
%changelog %changelog
# nospeccleaner # nospeccleaner

9
ceph.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 3 16:24:29 UTC 2018 - ncutler@suse.com
- Update to v14.0.1-1547-g08fca371b5:
+ mgr/volumes: Fix Python 3 import error
(fixes cluster deployment in py3 environment)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com
@ -12,7 +19,7 @@ Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com
- spec file: make ceph-common provide/obsolete libradosstriper1 - spec file: make ceph-common obsolete libradosstriper1
(in SES5 ceph-common requires libradosstriper1 with exact version match, (in SES5 ceph-common requires libradosstriper1 with exact version match,
while in SES6 there is no libradosstriper1 at all) while in SES6 there is no libradosstriper1 at all)

15
ceph.spec
View File

@ -96,7 +96,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 14.0.1.1545+g01bead277f Version: 14.0.1.1547+g08fca371b5
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -112,7 +112,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.0.1-1545-g01bead277f.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1547-g08fca371b5.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
@ -391,7 +391,6 @@ Obsoletes: libxio <= 1.7
%if 0%{with libradosstriper} %if 0%{with libradosstriper}
Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
%else %else
Provides: libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
Obsoletes: libradosstriper1 <= %{_epoch_prefix}%{version}-%{release} Obsoletes: libradosstriper1 <= %{_epoch_prefix}%{version}-%{release}
%endif %endif
%{?systemd_requires} %{?systemd_requires}
@ -971,7 +970,7 @@ integrated with the Ceph Manager Dashboard web UI.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-14.0.1-1545-g01bead277f %autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5
%build %build
@ -2020,9 +2019,13 @@ exit 0
%endif %endif
%files grafana-dashboards %files grafana-dashboards
%attr(0755,root,root) %dir %{_sysconfdir}/grafana %if 0%{?suse_version}
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards %attr(0750,root,grafana) %dir %{_sysconfdir}/grafana
%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards
%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
%else
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
%endif
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
%doc monitoring/grafana/dashboards/README %doc monitoring/grafana/dashboards/README
%doc monitoring/grafana/README.md %doc monitoring/grafana/README.md