mirror of
https://github.com/ceph/ceph
synced 2025-02-19 08:57:27 +00:00
Merge remote-tracking branch 'gh/jewel'
This commit is contained in:
commit
91bf56e26b
@ -43,6 +43,7 @@ restorecon -R /var/log/ceph > /dev/null 2>&1;
|
||||
# /var/run/ceph.
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
|
||||
%global _with_systemd 1
|
||||
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
|
||||
%endif
|
||||
|
||||
# LTTng-UST enabled on Fedora, RHEL 6, and SLES 12
|
||||
@ -143,6 +144,7 @@ BuildRequires: yasm
|
||||
%if 0%{?_with_systemd}
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: systemd
|
||||
%{?systemd_requires}
|
||||
%endif
|
||||
PreReq: %fillup_prereq
|
||||
@ -961,7 +963,7 @@ exit 0
|
||||
|
||||
%post -n ceph-common
|
||||
%if 0%{?_with_systemd}
|
||||
systemd-tmpfiles --create --prefix=/run/ceph
|
||||
%tmpfiles_create %{_tmpfilesdir}/ceph-common.conf
|
||||
%endif
|
||||
|
||||
%postun -n ceph-common
|
||||
|
@ -8,7 +8,7 @@ AC_PREREQ(2.59)
|
||||
# VERSION define is not used by the code. It gets a version string
|
||||
# from 'git describe'; see src/ceph_ver.[ch]
|
||||
|
||||
AC_INIT([ceph], [10.0.0], [ceph-devel@vger.kernel.org])
|
||||
AC_INIT([ceph], [10.0.1], [ceph-devel@vger.kernel.org])
|
||||
|
||||
AX_CXX_COMPILE_STDCXX_11(, mandatory)
|
||||
|
||||
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
ceph (10.0.1-1) stable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Alfredo Deza <adeza@redhat.com> Mon, 14 Dec 2015 23:48:54 +0000
|
||||
|
||||
ceph (10.0.0-1) stable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
Loading…
Reference in New Issue
Block a user