[sheepdog] [PATCH stable-0.6 2/2] fix 'make rpm'

Hitoshi Mitake mitake.hitoshi at gmail.com
Thu Aug 15 08:36:32 CEST 2013


From: Liu Yuan <namei.unix at gmail.com>

Signed-off-by: Liu Yuan <namei.unix at gmail.com>
Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

Conflicts:
	include/Makefile.am
	sheepdog.spec.in

The above conflicts are fixed manually by Hitoshi Mitake.

Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 sheepdog.spec.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sheepdog.spec.in b/sheepdog.spec.in
index 5e19366..1ce122b 100644
--- a/sheepdog.spec.in
+++ b/sheepdog.spec.in
@@ -1,5 +1,5 @@
 Name: sheepdog
-Summary: The Sheepdog Distributed Storage System for KVM/QEMU
+Summary: The Sheepdog Distributed Storage System for QEMU
 Version: @version@
 Release: 1%{?dist}
 License: GPLv2 and GPLv2+
@@ -8,27 +8,27 @@ URL: http://www.osrg.net/sheepdog
 Source0: http://downloads.sourceforge.net/project/sheepdog/%{name}/%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
-Requires: corosync
+Requires: corosync fuse zookeeper
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
 # Build bits
 BuildRequires: autoconf automake
-BuildRequires: corosync corosynclib corosynclib-devel
+BuildRequires: corosynclib-devel userspace-rcu-devel fuse-devel zookeeper-lib-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 This package contains the Sheepdog server, and command line tool which offer
-a distributed object storage system for KVM.
+a distributed object storage system for QEMU.
 
 %prep
 %setup -q
 
 %build
 ./autogen.sh
-%{configure} --with-initddir=%{_initrddir}
+%{configure} --with-initddir=%{_initrddir} --enable-sheepfs --enalbe-zookeeper
 
 make %{_smp_mflags}
 
-- 
1.8.1.2




More information about the sheepdog mailing list