From de8bfba2ef1bf7eeadac3825088621a62306e9b2 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Oct 31 2014 02:35:39 +0000
Subject: Do not use systemd-run in Fedora 19

Resolves: rhbz#1157938

---

diff --git a/ceph-remove-systemd-init-detection.patch b/ceph-remove-systemd-init-detection.patch
new file mode 100644
index 0000000..507b134
--- /dev/null
+++ b/ceph-remove-systemd-init-detection.patch
@@ -0,0 +1,40 @@
+From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Fri, 31 Oct 2014 03:27:46 +0100
+Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
+
+---
+ src/init-ceph.in | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index 95723b0..1effb56 100644
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
+ 
+ EXIT_STATUS=0
+ 
+-# detect systemd
+-SYSTEMD=0
+-grep -qs systemd /proc/1/comm && SYSTEMD=1
+-
+ signal_daemon() {
+     name=$1
+     daemon=$2
+@@ -276,11 +272,7 @@ for name in $what; do
+ 	    [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
+ 	    [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
+ 
+-	    if [ $SYSTEMD -eq 1 ]; then
+-		cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
+-	    else
+-		cmd="$files $wrap $cmd --cluster $cluster $runmode"
+-	    fi
++	    cmd="$files $wrap $cmd --cluster $cluster $runmode"
+ 
+ 	    if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
+ 		get_conf pre_mount "true" "pre mount command"
+-- 
+1.9.3
+
diff --git a/ceph.spec b/ceph.spec
index 8439aa7..d8b9ee0 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -10,15 +10,16 @@
 #################################################################################
 Name:		ceph
 Version:	0.80.5
-Release:	10%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
-License:	GPL-2.0
+License:	GPLv2
 Group:		System Environment/Base
 URL:		http://ceph.com/
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
 Patch0:		ceph-google-gperftools.patch
 Patch1:		ceph-no-format-security.patch
+Patch2:		ceph-remove-systemd-init-detection.patch
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -306,6 +307,7 @@ librbd1 or libcephfs1 instead.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Find jni.h
@@ -769,6 +771,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files libs-compat
 
 %changelog
+* Fri Oct 31 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-11
+- Fix bz#1157938
+
 * Tue Sep 9 2014 Dan Horák <dan[at]danny.cz> - 1:0.80.5-10
 - update Requires for s390(x)