The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=9094835645403....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 9094835645403e63f2e8a34a33e8fc9672d9f64d
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Jun 28 02:04:51 2018 -0400
New release (1:13.2.0-3)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
b/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
deleted file mode 100644
index ffc38da..0000000
--- a/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- ceph-13.1.0/src/mon/LogMonitor.cc.orig 2018-05-08 08:12:50.101933925 -0400
-+++ ceph-13.1.0/src/mon/LogMonitor.cc 2018-05-08 08:12:59.470933925 -0400
-@@ -62,7 +62,6 @@
- {
- dout(10) << "create_initial -- creating initial map" << dendl;
- LogEntry e;
-- memset(&e.who, 0, sizeof(e.who));
- e.name = g_conf->name;
- e.stamp = ceph_clock_now();
- e.prio = CLOG_INFO;
---- ceph-13.1.0/src/mon/MonMap.h.orig 2018-05-08 08:13:08.173933925 -0400
-+++ ceph-13.1.0/src/mon/MonMap.h 2018-05-08 08:13:17.391933925 -0400
-@@ -118,7 +118,6 @@
-
- MonMap()
- : epoch(0) {
-- memset(&fsid, 0, sizeof(fsid));
- }
-
- uuid_d& get_fsid() { return fsid; }
---- ceph-13.1.0/src/os/filestore/HashIndex.h.orig 2018-05-08 08:13:35.377933925 -0400
-+++ ceph-13.1.0/src/os/filestore/HashIndex.h 2018-05-08 08:13:59.853933925 -0400
-@@ -395,7 +395,7 @@
-
- struct CmpPairBitwise {
- bool operator()(const pair<string, ghobject_t>& l,
-- const pair<string, ghobject_t>& r)
-+ const pair<string, ghobject_t>& r) const
- {
- if (l.first < r.first)
- return true;
-@@ -408,7 +408,7 @@
- };
-
- struct CmpHexdigitStringBitwise {
-- bool operator()(const string& l, const string& r) {
-+ bool operator()(const string& l, const string& r) const {
- return reverse_hexdigit_bits_string(l) < reverse_hexdigit_bits_string(r);
- }
- };
---- ceph-13.1.0/src/os/filestore/LFNIndex.h.orig 2018-05-08 08:14:06.721933925 -0400
-+++ ceph-13.1.0/src/os/filestore/LFNIndex.h 2018-05-08 08:14:34.671933925 -0400
-@@ -63,7 +63,7 @@
- out: \
- complete_inject_failure(); \
- return r; \
-- } catch (RetryException) { \
-+ } catch (RetryException&) { \
- failed = true; \
- } catch (...) { \
- ceph_abort(); \
---- ceph-13.1.0/src/client/Inode.h.orig 2018-05-08 08:08:26.305933925 -0400
-+++ ceph-13.1.0/src/client/Inode.h 2018-05-08 08:08:38.029933925 -0400
-@@ -279,7 +279,6 @@
- _ref(0), ll_ref(0)
- {
- memset(&dir_layout, 0, sizeof(dir_layout));
-- memset("a, 0, sizeof(quota));
- }
- ~Inode();
-
---- ceph-13.1.0/src/osd/OSDMap.h.orig 2018-05-08 08:14:51.066933925 -0400
-+++ ceph-13.1.0/src/osd/OSDMap.h 2018-05-08 08:15:14.148933925 -0400
-@@ -427,7 +427,6 @@
- encode_features(0),
- epoch(e), new_pool_max(-1), new_flags(-1), new_max_osd(-1),
- have_crc(false), full_crc(0), inc_crc(0) {
-- memset(&fsid, 0, sizeof(fsid));
- }
- explicit Incremental(bufferlist &bl) {
- bufferlist::iterator p = bl.begin();
-@@ -607,7 +606,6 @@
- cached_up_osd_features(0),
- crc_defined(false), crc(0),
- crush(std::make_shared<CrushWrapper>()) {
-- memset(&fsid, 0, sizeof(fsid));
- }
-
- private:
---- ceph-13.1.0/src/common/cmdparse.h.orig 2018-05-08 08:09:17.772933925 -0400
-+++ ceph-13.1.0/src/common/cmdparse.h 2018-05-08 08:09:36.500933925 -0400
-@@ -54,7 +54,7 @@
- try {
- val = boost::get<T>(cmdmap.find(k)->second);
- return true;
-- } catch (boost::bad_get) {
-+ } catch (boost::bad_get&) {
- handle_bad_get(cct, k, typeid(T).name());
- }
- }
---- ceph-13.1.0/src/messages/MClientReply.h.orig 2018-05-08 08:10:22.281933925 -0400
-+++ ceph-13.1.0/src/messages/MClientReply.h 2018-05-08 08:10:46.660933925 -0400
-@@ -187,7 +187,7 @@
- if (features & CEPH_FEATURE_MDS_QUOTA)
- decode(quota, p);
- else
-- memset("a, 0, sizeof(quota));
-+ quota = quota_info_t{};
-
- if ((features & CEPH_FEATURE_FS_FILE_LAYOUT_V2))
- decode(layout.pool_ns, p);
---- ceph-13.1.0/src/messages/MMonSubscribeAck.h.orig 2018-05-08 08:10:58.478933925 -0400
-+++ ceph-13.1.0/src/messages/MMonSubscribeAck.h 2018-05-08 08:11:17.484933925 -0400
-@@ -23,7 +23,6 @@
-
- MMonSubscribeAck() : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
- interval(0) {
-- memset(&fsid, 0, sizeof(fsid));
- }
- MMonSubscribeAck(uuid_d& f, int i) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
- interval(i), fsid(f) { }
---- ceph-13.1.0/src/mgr/DaemonState.h.orig 2018-05-08 08:12:16.521933925 -0400
-+++ ceph-13.1.0/src/mgr/DaemonState.h 2018-05-08 08:12:40.995933925 -0400
-@@ -130,7 +130,7 @@
- auto p = config_defaults_bl.begin();
- try {
- decode(config_defaults, p);
-- } catch (buffer::error e) {
-+ } catch (buffer::error& e) {
- }
- }
- return config_defaults;
---- ceph-13.1.0/cmake/modules/BuildDPDK.cmake.orig 2018-05-08 08:41:02.168933925 -0400
-+++ ceph-13.1.0/cmake/modules/BuildDPDK.cmake 2018-05-08 08:41:47.411933925 -0400
-@@ -71,7 +71,7 @@
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND "true")
- ExternalProject_Add_Step(dpdk-ext patch-config
-- COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine}
-+ COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine} ${arch}
- DEPENDEES configure
- DEPENDERS build)
- # easier to adjust the config
-@@ -86,7 +86,7 @@
- # target
- file(MAKE_DIRECTORY ${DPDK_INCLUDE_DIR})
- foreach(c
-- pci bus_pci
-+ bus_pci pci
- eal
- mempool mempool_ring mempool_stack ring)
- add_library(dpdk::${c} STATIC IMPORTED)
---- ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh.orig 2018-05-08 08:42:01.089933925
-0400
-+++ ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh 2018-05-08 08:43:11.781933925 -0400
-@@ -15,8 +15,12 @@
- shift
- machine=$1
- shift
-+arch=$1
-+shift
-
- setconf CONFIG_RTE_MACHINE "${machine}"
-+setconf CONFIG_RTE_ARCH "${arch}"
-+
- # Disable experimental features
- setconf CONFIG_RTE_NEXT_ABI n
- setconf CONFIG_RTE_LIBRTE_MBUF_OFFLOAD n
-@@ -38,6 +42,7 @@
- setconf CONFIG_RTE_LIBRTE_VMXNET3_PMD n
- setconf CONFIG_RTE_LIBRTE_PMD_VHOST n
- setconf CONFIG_RTE_APP_EVENTDEV n
-+setconf CONFIG_RTE_MAX_VFIO_GROUPS 64
-
- # no test
- setconf CONFIG_RTE_APP_TEST n
diff --git a/0001-blobstore.patch b/0001-blobstore.patch
new file mode 100644
index 0000000..97462f0
--- /dev/null
+++ b/0001-blobstore.patch
@@ -0,0 +1,11 @@
+--- ceph-13.1.0/src/spdk/lib/blob/blobstore.c.orig 2018-05-08 16:04:30.329933925 -0400
++++ ceph-13.1.0/src/spdk/lib/blob/blobstore.c 2018-05-08 16:04:55.240933925 -0400
+@@ -2947,7 +2947,7 @@
+
+ /* START spdk_blob_resize */
+ int
+-spdk_blob_resize(struct spdk_blob *_blob, uint64_t sz)
++spdk_blob_resize(struct spdk_blob *_blob, size_t sz)
+ {
+ struct spdk_blob_data *blob = __blob_to_data(_blob);
+ int rc;
diff --git a/ceph.spec b/ceph.spec
index 8b0de11..96ba41f 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -16,6 +16,7 @@
#
%global _hardened_build 1
+%bcond_with python3
%bcond_without ocf
%bcond_with make_check
%ifarch s390 s390x
@@ -28,6 +29,7 @@
%bcond_without ceph_test_package
%bcond_without cephfs_java
%bcond_without lttng
+%global _remote_tarball_prefix
https://download.ceph.com/tarballs/
%endif
%if 0%{?suse_version}
%bcond_with selinux
@@ -75,22 +77,23 @@
%global _find_debuginfo_dwz_opts %{nil}
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-%global _rundir %{_localstatedir}/run
+%global _rundir %{_localstatedir}/run/
%else
-%global _rundir /run
+%global _rundir /run/
%endif
#################################################################################
# main package definition
#################################################################################
Name: ceph
-Version: 13.1.0
-Release: 2%{?dist}
+Version: 13.2.0
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
-# define %%_epoch_prefix macro which will expand to the empty string if %%epoch is
undefined
+# define _epoch_prefix macro which will expand to the empty string if epoch is
+# undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: User space components of the Ceph file system
@@ -99,14 +102,9 @@ 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:
http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
+Source0: %{?_remote_tarball_prefix}%{name}-%{version}.tar.gz
#
https://bugzilla.redhat.com/show_bug.cgi?id=1474773
-Patch001: 0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
-#Patch001: 0001-src-rocksdb-util-murmurhash.patch
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1474774
-#Patch002: 0002-cmake-Support-ppc64.patch
-#Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
-#Patch005: 0005-src-rocksdb-table-block.h.patch
+Patch001: 0001-blobstore.patch
%if 0%{?suse_version}
# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
@@ -136,6 +134,7 @@ BuildRequires: gperf
BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
+BuildRequires: cryptopp-devel
%if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough.
@@ -204,7 +203,6 @@ BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
-BuildRequires: rdma-core-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
@@ -212,7 +210,7 @@ BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
-# RDMA is no longer built on 32-bit ARM: see #1484155
+# RDMA is no longer built on 32-bit ARM: see rhbz#1484155
%ifnarch %{arm}
BuildRequires: rdma-core-devel
%endif
@@ -226,7 +224,8 @@ BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7
%endif
# python34-... for RHEL, python3-... for all other supported distros
-%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
+%if %{with python3}
+%if 0%{?rhel}
BuildRequires: python34-devel
BuildRequires: python34-setuptools
BuildRequires: python34-Cython
@@ -235,6 +234,7 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
+%endif
# distro-conditional make check dependencies
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
@@ -394,6 +394,12 @@ Requires: python%{_python_buildid}-jinja2
Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-werkzeug
Requires: pyOpenSSL%{_python_buildid}
+%if 0%{?fedora}
+Requires: python%{_python_buildid}-bcrypt
+%endif
+%if 0%{?rhel}
+Requires: py-bcrypt
+%endif
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy
@@ -562,6 +568,7 @@ This package contains Python 2 libraries for interacting with Cephs
RADOS
gateway.
%endif
+%if 0%{with python3}
%package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway
%if 0%{?suse_version}
@@ -572,6 +579,7 @@ Requires: python%{python3_pkgversion}-rados =
%{_epoch_prefix}%{version}-%{relea
%description -n python%{python3_pkgversion}-rgw
This package contains Python 3 libraries for interacting with Cephs RADOS
gateway.
+%endif
%if 0%{with python2}
%package -n python-rados
@@ -586,6 +594,7 @@ This package contains Python 2 libraries for interacting with Cephs
RADOS
object store.
%endif
+%if 0%{with python3}
%package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store
%if 0%{?suse_version}
@@ -596,6 +605,7 @@ Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-rados
This package contains Python 3 libraries for interacting with Cephs RADOS
object store.
+%endif
%package -n libradosstriper1
Summary: RADOS striping interface
@@ -669,6 +679,7 @@ This package contains Python 2 libraries for interacting with Cephs
RADOS
block device.
%endif
+%if 0%{with python3}
%package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device
%if 0%{?suse_version}
@@ -679,6 +690,7 @@ Requires: python%{python3_pkgversion}-rados =
%{_epoch_prefix}%{version}-%{relea
%description -n python%{python3_pkgversion}-rbd
This package contains Python 3 libraries for interacting with Cephs RADOS
block device.
+%endif
%package -n libcephfs2
Summary: Ceph distributed file system client library
@@ -727,6 +739,7 @@ This package contains Python 2 libraries for interacting with Cephs
distributed
file system.
%endif
+%if 0%{with python3}
%package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system
%if 0%{?suse_version}
@@ -737,8 +750,9 @@ Requires: python%{python3_pkgversion}-rados =
%{_epoch_prefix}%{version}-%{relea
%description -n python%{python3_pkgversion}-cephfs
This package contains Python 3 libraries for interacting with Cephs distributed
file system.
+%endif
-%if 0%{with python2}
+%if 0%{with python3}
%package -n python%{python3_pkgversion}-ceph-argparse
Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
@@ -919,7 +933,11 @@ cmake .. \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
+%if %{with python3}
-DWITH_PYTHON3=ON \
+%else
+ -DWITH_PYTHON3=OFF \
+%endif
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
%if %{with python2}
-DWITH_PYTHON2=ON \
@@ -927,7 +945,7 @@ cmake .. \
-DWITH_PYTHON2=OFF \
-DMGR_PYTHON_VERSION=3 \
%endif
-%if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
+%if ( ( 0%{?rhel} && 0%{?rhel} < 8) && ! 0%{?centos} )
-DWITH_SUBMAN=ON \
%endif
%if 0%{without ceph_test_package}
@@ -955,13 +973,15 @@ cmake .. \
%else
-DWITH_BOOST_CONTEXT=OFF \
%endif
-%ifnarch %{arm}
+%ifarch %{arm}
-DWITH_RDMA=OFF \
%endif
+ -DWITH_DPDK=ON \
-DBOOST_J=$CEPH_SMP_NCPUS
make "$CEPH_MFLAGS_JOBS"
+
%if 0%{with make_check}
%check
# run in-tree unittests
@@ -1006,7 +1026,7 @@ install -m 0644 -D udev/95-ceph-osd.rules
%{buildroot}%{_udevrulesdir}/95-ceph-o
#set up placeholder directories
mkdir -p %{buildroot}%{_sysconfdir}/ceph
-mkdir -p %{buildroot}%{_rundir}/ceph
+mkdir -p %{buildroot}%{_rundir}ceph
mkdir -p %{buildroot}%{_localstatedir}/log/ceph
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
@@ -1025,6 +1045,9 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%py3_compile %{buildroot}%{python3_sitelib}
%endif
+%clean
+rm -rf %{buildroot}
+
#################################################################################
# files and systemd scriptlets
#################################################################################
@@ -1071,7 +1094,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%if 0%{with python2}
%{python_sitelib}/ceph_detect_init*
%{python_sitelib}/ceph_disk*
-%else
+%endif
+%if 0%{with python3}
%{python3_sitelib}/ceph_detect_init*
%{python3_sitelib}/ceph_disk*
%endif
@@ -1079,7 +1103,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%dir %{python_sitelib}/ceph_volume
%{python_sitelib}/ceph_volume/*
%{python_sitelib}/ceph_volume-*
-%else
+%endif
+%if 0%{with python3}
%dir %{python3_sitelib}/ceph_volume
%{python3_sitelib}/ceph_volume/*
%{python3_sitelib}/ceph_volume-*
@@ -1102,6 +1127,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
%post base
+/sbin/ldconfig
%if 0%{?suse_version}
%fillup_only
if [ $1 -eq 1 ] ; then
@@ -1124,6 +1150,7 @@ fi
%endif
%postun base
+/sbin/ldconfig
test -n "$FIRST_ARG" || FIRST_ARG=$1
%if 0%{?suse_version}
DISABLE_RESTART_ON_UPDATE="yes"
@@ -1171,7 +1198,6 @@ fi
%{_bindir}/rbd-replay-prep
%endif
%{_bindir}/ceph-post-file
-%{_bindir}/ceph-brag
%{_tmpfilesdir}/ceph-common.conf
%{_mandir}/man8/ceph-authtool.8*
%{_mandir}/man8/ceph-conf.8*
@@ -1202,7 +1228,8 @@ fi
%if 0%{with python2}
%{python_sitelib}/ceph_argparse.py*
%{python_sitelib}/ceph_daemon.py*
-%else
+%endif
+%if 0%{with python3}
%{python3_sitelib}/ceph_argparse.py
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
%{python3_sitelib}/ceph_daemon.py
@@ -1529,7 +1556,7 @@ fi
%{_mandir}/man8/ceph-bluestore-tool.8*
%{_mandir}/man8/ceph-volume.8*
%{_mandir}/man8/ceph-volume-systemd.8*
-%if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
+%if ( ( 0%{?rhel} && 0%{?rhel} < 8) && ! 0%{?centos} )
%attr(0755,-,-) %{_sysconfdir}/cron.hourly/subman
%endif
%{_unitdir}/ceph-osd@.service
@@ -1543,11 +1570,6 @@ fi
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl preset ceph-osd(a)\*.service ceph-volume(a)\*.service ceph-osd.target
>/dev/null 2>&1 || :
fi
-%if 0%{?sysctl_apply}
- %sysctl_apply 90-ceph-osd.conf
-%else
- /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null
2>&1 || :
-%endif
%endif
%if 0%{?fedora} || 0%{?rhel}
%systemd_post ceph-osd(a)\*.service ceph-volume(a)\*.service ceph-osd.target
@@ -1555,6 +1577,11 @@ fi
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
fi
+%if 0%{?sysctl_apply}
+ %sysctl_apply 90-ceph-osd.conf
+%else
+ /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null
2>&1 || :
+%endif
%preun osd
%if 0%{?suse_version}
@@ -1629,9 +1656,11 @@ fi
%{python_sitearch}/rados-*.egg-info
%endif
+%if 0%{with python3}
%files -n python%{python3_pkgversion}-rados
%{python3_sitearch}/rados.cpython*.so
%{python3_sitearch}/rados-*.egg-info
+%endif
%ldconfig_scriptlets -n libradosstriper1
%files -n libradosstriper1
@@ -1680,9 +1709,11 @@ fi
%{python_sitearch}/rgw-*.egg-info
%endif
+%if 0%{with python3}
%files -n python%{python3_pkgversion}-rgw
%{python3_sitearch}/rgw.cpython*.so
%{python3_sitearch}/rgw-*.egg-info
+%endif
%if 0%{with python2}
%files -n python-rbd
@@ -1690,9 +1721,11 @@ fi
%{python_sitearch}/rbd-*.egg-info
%endif
+%if 0%{with python3}
%files -n python%{python3_pkgversion}-rbd
%{python3_sitearch}/rbd.cpython*.so
%{python3_sitearch}/rbd-*.egg-info
+%endif
%ldconfig_scriptlets -n libcephfs2
%files -n libcephfs2
@@ -1711,13 +1744,15 @@ fi
%{python_sitelib}/ceph_volume_client.py*
%endif
+%if 0%{with python3}
%files -n python%{python3_pkgversion}-cephfs
%{python3_sitearch}/cephfs.cpython*.so
%{python3_sitearch}/cephfs-*.egg-info
%{python3_sitelib}/ceph_volume_client.py
%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
+%endif
-%if 0%{with python2}
+%if 0%{with python3}
%files -n python%{python3_pkgversion}-ceph-argparse
%{python3_sitelib}/ceph_argparse.py
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
@@ -1815,7 +1850,7 @@ fi
rm -f ${FILE_CONTEXT}.pre
# The fixfiles command won't fix label for /var/run/ceph
-/usr/sbin/restorecon -R %{_rundir}/ceph > /dev/null 2>&1
+/usr/sbin/restorecon -R %{_rundir}ceph > /dev/null 2>&1
# Start the daemons iff they were running before
if test $STATUS -eq 0; then
@@ -1851,7 +1886,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
rm -f ${FILE_CONTEXT}.pre
# The fixfiles command won't fix label for /var/run/ceph
- /usr/sbin/restorecon -R %{_rundir}/ceph > /dev/null 2>&1
+ /usr/sbin/restorecon -R %{_rundir}ceph > /dev/null 2>&1
# Start the daemons if they were running before
if test $STATUS -eq 0; then
@@ -1870,9 +1905,18 @@ exit 0
%changelog
+* Thu Jun 28 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.2.0-3
+- New release (1:13.2.0-3)
+
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:13.1.0-2
- Rebuilt for Python 3.7
+* Thu May 31 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.2.0-1
+- New release (1:13.2.0-1)
+
+* Tue May 8 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.1.0-2
+- New release (1:13.1.0-2) +crypto_plugins
+
* Tue May 8 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.1.0-1
- New release (1:13.1.0-1)
diff --git a/sources b/sources
index e0ac550..ae5b656 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-13.1.0.tar.gz) =
d4feb0b0bac5e30232eddcc3f69c1d939f0b5268491acecba9a58dcadbbdaab6367f415ede924ca84de9a89a686410613cdc631f8aff15aec0eb4531138eec7a
+SHA512 (ceph-13.2.0.tar.gz) =
2524ad5a868024463e1a1edc5bd9c3f7bc1f58e47bf8d331902ed53206120abc6a427dd9c1d657131e67efd955d6ed8052b6c3fed8658aa905d58ac58ee62973