- updated to 17.2.7

[packages/ceph.git] / ceph.spec

diff --git a/ceph.spec b/ceph.spec
index fbe35e44cce728cab31991f6860c294f4c265201..b8f6371826cc01becf2805cc47ccae0849601992 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -8,6 +8,7 @@
 # - package sphinx docs (from doc/)
 #
 # Note on versioning: http://docs.ceph.com/docs/master/releases/
+# Reef (18.1.2) is in RC stage currently
 #
 # Conditional build:
 %bcond_without java            # Java binding
@@ -43,16 +44,18 @@
 %ifnarch %{x8664} aarch64 mips64 ppc64 sparc64 s390x
 %undefine      with_seastar
 %endif
+
+%{?with_java:%{?use_default_jdk}}
 #
 Summary:       User space components of the Ceph file system
 Summary(pl.UTF-8):     Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:          ceph
-Version:       17.2.3
-Release:       3
+Version:       17.2.7
+Release:       1
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: 96f10fa942ec0db4008993cddaec88ec
+# Source0-md5: 843fb59f95f62e0e156539e49a2a3a9a
 Source1:       ceph.sysconfig
 Source3:       ceph.tmpfiles
 Patch0:                %{name}-python.patch
@@ -100,8 +103,8 @@ BuildRequires:      gperf
 %{?with_kerberos:BuildRequires:        heimdal-devel}
 %{?with_seastar:BuildRequires: hwloc-devel >= 1.11.2}
 %if %{with java}
-BuildRequires: jdk
-BuildRequires: jre-X11
+%buildrequires_jdk
+BuildRequires: %{?use_jdk:%{use_jdk}-jre-base-X11}%{!?use_jdk:jre-X11}
 %endif
 BuildRequires: keyutils-devel
 BuildRequires: leveldb-devel >= 1.23-2
@@ -145,11 +148,12 @@ BuildRequires:    python3 >= 1:3.2
 BuildRequires: python3-Cython
 BuildRequires: python3-PyYAML
 BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
 %{?with_tests:BuildRequires:   python3-tox >= 2.9.1}
 BuildRequires: rabbitmq-c-devel
 %{?with_seastar:BuildRequires: ragel >= 6.10}
 %{?with_system_rocksdb:BuildRequires:  rocksdb-devel >= 5.14}
-BuildRequires: rpmbuild(macros) >= 1.671
+BuildRequires: rpmbuild(macros) >= 2.021
 %{?with_qat:BuildRequires:     qatlib-devel}
 BuildRequires: sed >= 4.0
 BuildRequires: snappy-devel
@@ -447,7 +451,6 @@ ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/ceph.service
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ceph.conf
 
 %if %{without tests}
-%{__rm} $RPM_BUILD_ROOT%{_javadir}/libcephfs-test.jar
 %{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/{ceph,ceph_volume}/tests
 %endif
 
@@ -527,6 +530,7 @@ fi
 %attr(755,root,root) %{_bindir}/ceph-dencoder
 %attr(755,root,root) %{_bindir}/ceph-diff-sorted
 %attr(755,root,root) %{_bindir}/ceph-erasure-code-tool
+%attr(755,root,root) %{_bindir}/ceph-exporter
 %attr(755,root,root) %{_bindir}/ceph-immutable-object-cache
 %attr(755,root,root) %{_bindir}/ceph-kvstore-tool
 %attr(755,root,root) %{_bindir}/ceph-mds