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

Accepting request 501108 from filesystems:ceph:luminous

Browse Source 
- Update to version 12.0.3+git.1496494491.ba3c561a92:
  + merge upstream master (97d6e150e5)

OBS-URL: https://build.opensuse.org/request/show/501108
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=89
This commit is contained in:
Nathan Cutler
2017-06-05 09:29:59 +00:00
committed by Git OBS Bridge
parent 87d362a4b0
commit 08319c2eab
8 changed files with 239 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ceph-test.spec
View File

@@ -24,10 +24,8 @@
%bcond_with xio
%ifarch s390 s390x
%bcond_with tcmalloc
%bcond_with rgw_beast
%else
%bcond_without tcmalloc
%bcond_without rgw_beast
%endif
%bcond_without lowmem_builder
%bcond_with minimal_debugging_information
@@ -66,12 +64,20 @@
# disable dwz which compresses the debuginfo
%global _find_debuginfo_dwz_opts %{nil}
#################################################################################
# main package definition
#################################################################################
Name: ceph-test
Version: 12.0.3+git.1495798013.23dd2b67dc
Version: 12.0.3+git.1496494491.ba3c561a92
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0 WITH Autoconf-exception-2.0 and BSD-3-Clause and MIT
%if 0%{?suse_version}
@@ -110,6 +116,7 @@ BuildRequires: selinux-policy-devel
BuildRequires: /usr/share/selinux/devel/policyhelp
%endif
BuildRequires: bc
BuildRequires: gperf
BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
@@ -205,14 +212,11 @@ BuildRequires: lttng-ust-devel
BuildRequires: babeltrace-devel
%endif
%endif
# expat and fastcgi for RGW
%if 0%{?suse_version}
BuildRequires: libexpat-devel
BuildRequires: FastCGI-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
BuildRequires: fcgi-devel
%endif
#hardened-cc1
%if 0%{?fedora} || 0%{?rhel}
@@ -432,7 +436,7 @@ cmake .. \
%if 0%{with ocf}
-DWITH_OCF=ON \
%endif
%if 0%{with rgw_beast}
%ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64
-DWITH_RADOSGW_BEAST_FRONTEND=ON \
%else
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
@@ -546,6 +550,7 @@ rm -rf %{buildroot}%{_bindir}/cephfs-journal-tool
rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
rm -rf %{buildroot}%{_sbindir}/ceph-disk
rm -rf %{buildroot}%{_sbindir}/rcceph
rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
rm -rf %{buildroot}%{_libdir}/rados-classes/*
@@ -554,18 +559,19 @@ rm -rf %{buildroot}%{_libdir}/ceph/compressor/libceph_*.so*
rm -rf %{buildroot}%{_libdir}/ceph/crypto/libceph_*.so*
rm -rf %{buildroot}%{_libdir}/libos_tp.so*
rm -rf %{buildroot}%{_libdir}/libosd_tp.so*
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ceph
rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph
rm -rf %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.*
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
rm -rf %{buildroot}%{_unitdir}/ceph.target
rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-disk.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-run.8*
rm -rf %{buildroot}%{_mandir}/man8/crushtool.8*
rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
@@ -606,6 +612,7 @@ rm -rf %{buildroot}%{_mandir}/man8/rbd-replay-prep.8*
rm -rf %{buildroot}%{_datadir}/ceph/known_hosts_drop.ceph.com
rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com
rm -rf %{buildroot}%{_datadir}/ceph/id_rsa_drop.ceph.com.pub
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ceph
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/rados
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/rbd
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin
@@ -644,6 +651,7 @@ rm -rf %{buildroot}%{_bindir}/rbd-nbd
rm -rf %{buildroot}%{_mandir}/man8/rbd-nbd.8*
rm -rf %{buildroot}%{_bindir}/radosgw
rm -rf %{buildroot}%{_bindir}/radosgw-token
rm -rf %{buildroot}%{_bindir}/radosgw-es
rm -rf %{buildroot}%{_bindir}/radosgw-object-expirer
rm -rf %{buildroot}%{_mandir}/man8/radosgw.8*
rm -rf %{buildroot}%{_unitdir}/ceph-radosgw@.service
@@ -652,18 +660,14 @@ rm -rf %{buildroot}%{_bindir}/ceph-clsinfo
rm -rf %{buildroot}%{_bindir}/ceph-bluestore-tool
rm -rf %{buildroot}%{_bindir}/ceph-objectstore-tool
rm -rf %{buildroot}%{_bindir}/ceph-osd
rm -rf %{buildroot}%{_sbindir}/ceph-disk
rm -rf %{buildroot}%{_sbindir}/ceph-disk-udev
rm -rf %{buildroot}%{_libexecdir}/ceph/ceph-osd-prestart.sh
rm -rf %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
rm -rf %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
rm -rf %{buildroot}%{_mandir}/man8/ceph-clsinfo.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-disk.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-osd.8*
rm -rf %{buildroot}%{_sysconfdir}/cron.hourly/subman
rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service
rm -rf %{buildroot}%{_unitdir}/ceph-osd.target
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd
rm -rf %{buildroot}%{_libdir}/librados.so.*
rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so*