- build with system ccs

Changed files:
    fence-antistatic.patch -> 1.1
    fence.spec -> 1.12

diff --git a/fence-antistatic.patch b/fence-antistatic.patch
new file mode 100644 (file)
index 0000000..bdc4fae
--- /dev/null
+++ b/fence-antistatic.patch
@@ -0,0 +1,13 @@
+--- cluster-2.00.00/fence/fenced/Makefile~     2007-04-03 15:10:16.000000000 +0000
++++ cluster-2.00.00/fence/fenced/Makefile      2007-04-03 15:13:45.221772000 +0000
+@@ -35,9 +35,8 @@
+       group.o \
+       member_cman.o \
+       agent.o \
+-      ../../ccs/lib/libccs.a \
+       ../../group/lib/libgroup.a
+-      $(CC) $(LDFLAGS) -o $@ $^ -lcman 
++      $(CC) $(LDFLAGS) -o $@ $^ -lcman -lccs
+ 
+ main.o: main.c fd.h
+       $(CC) $(CFLAGS) -c -o $@ $<

diff --git a/fence.spec b/fence.spec
index 3059f63dfdce79731c75f5db21be29c83df04119..03fd1825899a98e3e59ca3e36694b1a606fb7060 100644 (file)
--- a/fence.spec
+++ b/fence.spec
@@ -8,8 +8,10 @@ License:       GPL
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
 # Source0-md5: 2ef3f4ba9d3c87b50adfc9b406171085
+Patch0:                %{name}-antistatic.patch
 URL:           http://sources.redhat.com/cluster/fence/
 BuildRequires: cman-devel
+BuildRequires: ccs-devel
 BuildRequires: perl-base
 BuildRequires: rpm-pythonprov
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,6 +47,7 @@ zasilania).
 
 %prep
 %setup -q -n cluster-%{version}
+%patch0 -p1
 cd %{name}
 
 %{__perl} -pi -e 's/-Wall/%{rpmcflags} -Wall/' make/defines.mk.input
@@ -52,6 +55,8 @@ cd %{name}
 %{__perl} -pi -e 's@${top_srcdir}/../group/lib/libgroup.a@@'  fence/fence_tool/Makefile
 
 %build
+# libgroup.a is not packaged in group.spec, we must build it here
+%{__make} -C group/lib
 cd %{name}
 ./configure \
        --incdir=%{_includedir} \