[sheepdog] [PATCH v3 3/3] fix 'make rpm'

Liu Yuan namei.unix at gmail.com
Mon Aug 12 17:18:48 CEST 2013


Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 include/Makefile.am |    2 +-
 sheepdog.spec.in    |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index 4d0c229..06e97a6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,4 +3,4 @@ MAINTAINERCLEANFILES    = Makefile.in config.h.in
 noinst_HEADERS          = bitops.h event.h logger.h sheepdog_proto.h util.h \
 			  list.h net.h sheep.h exits.h strbuf.h rbtree.h \
 			  sha1.h option.h internal_proto.h shepherd.h work.h \
-			  sockfd_cache.h
+			  sockfd_cache.h compiler.h
diff --git a/sheepdog.spec.in b/sheepdog.spec.in
index dde9bd9..c1060f4 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}
 
@@ -67,6 +67,7 @@ fi
 %{_sbindir}/sheep
 %{_sbindir}/sheepfs
 %{_sbindir}/dog
+%{_sbindir}/shepherd
 %attr(755,-,-)%config %{_initddir}/sheepdog
 %dir %{_localstatedir}/lib/sheepdog
 %{_mandir}/man8/sheep.8*
-- 
1.7.9.5




More information about the sheepdog mailing list