- updated to 2.03.10 (the last 2nd generation cluster release)

- removed obsolete antistatic patch

Changed files:
    fence-antistatic.patch -> 1.2
    fence.spec -> 1.13

diff --git a/fence-antistatic.patch b/fence-antistatic.patch
deleted file mode 100644 (file)
index bdc4fae..0000000
--- a/fence-antistatic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 03fd1825899a98e3e59ca3e36694b1a606fb7060..62584f5a58cef42c67007f8f7a117802ee7e3e99 100644 (file)
--- a/fence.spec
+++ b/fence.spec
@@ -1,19 +1,19 @@
 Summary:       I/O fencing system
 Summary(pl.UTF-8):     System barier I/O
 Name:          fence
-Version:       2.00.00
+Version:       2.03.10
 Release:       1
 Epoch:         1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5: 2ef3f4ba9d3c87b50adfc9b406171085
-Patch0:                %{name}-antistatic.patch
+# Source0-md5: 379b560096e315d4b52e238a5c72ba4a
 URL:           http://sources.redhat.com/cluster/fence/
-BuildRequires: cman-devel
-BuildRequires: ccs-devel
+BuildRequires: cman-devel >= 2.03.10
+BuildRequires: ccs-devel >= 2.03.10
 BuildRequires: perl-base
 BuildRequires: rpm-pythonprov
+Requires:      cman-libs >= 2.03.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
@@ -47,31 +47,32 @@ zasilania).
 
 %prep
 %setup -q -n cluster-%{version}
-%patch0 -p1
-cd %{name}
-
-%{__perl} -pi -e 's/-Wall/%{rpmcflags} -Wall/' make/defines.mk.input
-%{__perl} -pi -e 's/-O2 //' fence_node/Makefile fence_tool/Makefile fenced/Makefile
-%{__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 \
+       --cc="%{__cc}" \
+       --cflags="%{rpmcflags} -Wall" \
+       --ldflags="%{rpmldflags}" \
        --incdir=%{_includedir} \
        --libdir=%{_libdir} \
+       --libexecdir=%{_libdir} \
        --mandir=%{_mandir} \
        --prefix=%{_prefix} \
-       --sbindir=%{_sbindir}
-%{__make} \
-       CC="%{__cc}"
+       --sbindir=%{_sbindir} \
+       --without_gfs \
+       --without_gfs2 \
+       --without_gnbd \
+       --without_kernel_modules
+
+# libgroup.a is not packaged anywhere, so we must build it here
+%{__make} -C group/lib
+
+%{__make} -C %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}
 
-%{__make} install \
+%{__make} -C %{name} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -79,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
-#%attr(754,root,root) /etc/rc.d/init.d/fenced
-%{_mandir}/man?/*
+%attr(755,root,root) %{_sbindir}/fence_*
+%attr(755,root,root) %{_sbindir}/fenced
+# TODO: PLDify
+#%attr(754,root,root) /etc/rc.d/init.d/scsi_reserve
+%{_datadir}/fence
+#%{_datadir}/snmp/mibs/powernet369.mib
+%{_mandir}/man8/fence.8*
+%{_mandir}/man8/fence_*.8*
+%{_mandir}/man8/fenced.8*