Accepting request 707781 from filesystems:ceph:nautilus
bsc#1136110 OBS-URL: https://build.opensuse.org/request/show/707781 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=235
This commit is contained in:
Git OBS Bridge
parent
1fb95e0999
commit
eb8ae87b0a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a46fa910151d2b2ff8486d58743fe479954c4dc8d3a3132d4304c5d2cf9aafba
|
||||
size 95226916
|
||||
3
ceph-14.2.1-468-g994fd9e0cc.tar.bz2
Normal file
3
ceph-14.2.1-468-g994fd9e0cc.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:610979d8eaf3afa6eca33b7b16663f6d7ce6a9ebc9ad79b522fb9a747969a075
|
||||
size 95224915
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
@ -100,7 +100,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 14.2.1.467+g9e10776aa2
|
||||
Version: 14.2.1.468+g994fd9e0cc
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
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
|
||||
%endif
|
||||
URL: http://ceph.com/
|
||||
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-467-g9e10776aa2.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-468-g994fd9e0cc.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
Source96: checkin.sh
|
||||
Source97: README-checkin.txt
|
||||
@ -426,12 +426,16 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{without python2}
|
||||
%endif
|
||||
%if 0%{with python2}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{without python2}
|
||||
%endif
|
||||
%if 0%{with libradosstriper}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
@ -452,6 +456,8 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{without python2}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
@ -464,6 +470,8 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{without python2}
|
||||
%endif
|
||||
%if 0%{with python2}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
@ -499,7 +507,7 @@ This package contains Ceph benchmarks and test tools.
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-14.2.1-467-g9e10776aa2
|
||||
%autosetup -p1 -n ceph-14.2.1-468-g994fd9e0cc
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
20
ceph.spec
20
ceph.spec
@ -100,7 +100,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 14.2.1.467+g9e10776aa2
|
||||
Version: 14.2.1.468+g994fd9e0cc
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
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
|
||||
%endif
|
||||
URL: http://ceph.com/
|
||||
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-467-g9e10776aa2.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-14.2.1-468-g994fd9e0cc.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
# _insert_obs_source_lines_here
|
||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
||||
@ -722,8 +722,10 @@ Group: Development/Libraries/Python
|
||||
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-rados = %{_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
|
||||
This package contains Python 3 libraries for interacting with Cephs RADOS
|
||||
gateway.
|
||||
@ -749,8 +751,10 @@ Group: Development/Libraries/Python
|
||||
Requires: python%{python3_pkgversion}
|
||||
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
|
||||
Provides: python3-rados = %{_epoch_prefix}%{version}-%{release}
|
||||
%if 0%{without python2}
|
||||
Provides: python-rados = %{_epoch_prefix}%{version}-%{release}
|
||||
Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release}
|
||||
%endif
|
||||
%description -n python%{python3_pkgversion}-rados
|
||||
This package contains Python 3 libraries for interacting with Cephs RADOS
|
||||
object store.
|
||||
@ -838,8 +842,10 @@ Group: Development/Libraries/Python
|
||||
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
|
||||
Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release}
|
||||
%if 0%{without python2}
|
||||
Provides: python-rbd = %{_epoch_prefix}%{version}-%{release}
|
||||
Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release}
|
||||
%endif
|
||||
%description -n python%{python3_pkgversion}-rbd
|
||||
This package contains Python 3 libraries for interacting with Cephs RADOS
|
||||
block device.
|
||||
@ -898,8 +904,10 @@ Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
|
||||
Provides: python3-cephfs = %{_epoch_prefix}%{version}-%{release}
|
||||
%if 0%{without python2}
|
||||
Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release}
|
||||
Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
|
||||
%endif
|
||||
%description -n python%{python3_pkgversion}-cephfs
|
||||
This package contains Python 3 libraries for interacting with Cephs distributed
|
||||
file system.
|
||||
@ -1070,7 +1078,7 @@ This package provides Ceph’s default alerts for Prometheus.
|
||||
# common
|
||||
#################################################################################
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-14.2.1-467-g9e10776aa2
|
||||
%autosetup -p1 -n ceph-14.2.1-468-g994fd9e0cc
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
@ -2207,9 +2215,9 @@ exit 0
|
||||
|
||||
%files grafana-dashboards
|
||||
%if 0%{?suse_version}
|
||||
%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
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%else
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user