From 67b73401fe819977d45b15c032ff7e79855c0b9d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 13 May 2015 14:57:48 +0200 Subject: [PATCH 1/2] ceph.spec.in: include SUSE in _with_systemd The master specfile newly defines a _with_systemd variable that should be true for the set of distros that are using systemd. Since this set of distros includes SUSE/openSUSE (at least for the more recent versions where ceph is supported), this commit sets _with_systemdto true on SUSE/openSUSE. http://tracker.ceph.com/issues/11610 Fixes: #11610 Signed-off-by: Nathan Cutler (cherry picked from commit 61303656faa913880008e6a6a1725d2fd7002c1f) --- ceph.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 7ccd122bbe1..e3a681d3605 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -5,12 +5,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -# Use systemd files on RHEL 7 and above. +# Use systemd files on RHEL 7 and above and in SUSE/openSUSE. # Note: We don't install unit files for the services yet. For now, # the _with_systemd variable only implies that we'll install # /etc/tmpfiles.d/ceph.conf in order to set up the socket directory in # /var/run/ceph. -%if 0%{?fedora} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} %global _with_systemd 1 %endif From 997b3f998d565a744bfefaaf34b08b891f8dbf64 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Fri, 5 Jun 2015 10:59:02 -0700 Subject: [PATCH 2/2] 9.0.1 --- configure.ac | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4b504008e28..264b382469f 100644 --- a/configure.ac +++ b/configure.ac @@ -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], [9.0.0], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [9.0.1], [ceph-devel@vger.kernel.org]) # Create release string. Used with VERSION for RPMs. RPM_RELEASE=0 diff --git a/debian/changelog b/debian/changelog index 414df670327..b8b456b39e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ceph (9.0.1-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Fri, 05 Jun 2015 10:59:02 -0700 + ceph (9.0.0-1) stable; urgency=low * New upstream release