Do not use systemd-run in Fedora 19

Resolves: rhbz#1157938

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
+

ceph.spec

@@ -10,15 +10,16 @@
 #################################################################################
 Name:		ceph
 Version:	0.80.5
-Release:	5%{?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}
@@ -33,7 +34,9 @@ Requires:	xfsprogs
 Requires:	cryptsetup
 Requires:	parted
 Requires:	util-linux
+%ifnarch s390 s390x
 Requires:	hdparm
+%endif
 # For initscript
 Requires:	redhat-lsb-core
 Requires(post):	binutils
@@ -59,7 +62,8 @@ BuildRequires:	leveldb-devel > 1.2
 %if ! ( 0%{?rhel} && 0%{?rhel} <= 6 )
 BuildRequires:	xfsprogs-devel
 %endif
-BuildRequires:	yasm
+# No yasm dependency for now, it causes selinux issues
+#BuildRequires:	yasm
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
 BuildRequires:	snappy-devel
 %endif
@@ -214,7 +218,7 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
 Obsoletes:	ceph-libs < 1:0.80.5
-Obsoletes:	libcephfs
+Obsoletes:	ceph-libcephfs < 1:0.80.5
 %endif
 %description -n libcephfs1
 Ceph is a distributed network file system designed to provide excellent
@@ -303,6 +307,7 @@ librbd1 or libcephfs1 instead.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Find jni.h
@@ -685,8 +690,17 @@ fi
 
 %post -n librbd1
 /sbin/ldconfig
+# First, cleanup
+rm -f /usr/lib64/qemu/librbd.so.1
+rmdir /usr/lib64/qemu 2>/dev/null || true
+rmdir /usr/lib64/ 2>/dev/null || true
+# If x86_64 and rhel6+, link the library to /usr/lib64/qemu -- rhel hack
+%ifarch x86_64
+%if 0%{?rhel} >= 6
 mkdir -p /usr/lib64/qemu/
 ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
+%endif
+%endif
 
 %postun -n librbd1
 /sbin/ldconfig
@@ -757,6 +771,25 @@ 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)
+
+* Wed Sep 3 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-9
+- Symlink librd.so.1 to /usr/lib64/qemu only on rhel6+ x86_64 (1136811)
+
+* Thu Aug 21 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-8
+- Revert the previous change
+- Fix bz 1118504, second attempt (yasm appears to be the package that caused this
+
+* Wed Aug 20 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-7
+- Several more merges from file to try to fix the selinux issue (1118504)
+
+* Sun Aug 17 2014 Kalev Lember <kalevlember@gmail.com> - 1:0.80.5-6
+- Obsolete ceph-libcephfs
+
 * Sat Aug 16 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-5
 - Do not require xfsprogs/xfsprogs-devel for el6
 - Require gperftools-devel for non-ppc*/s390* architectures only