rpms/fence/devel fence.spec,1.4,1.5 sources,1.4,1.5

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/fence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11035

Modified Files:
	fence.spec sources 
Log Message:
Merged from RHEL-4


Index: fence.spec
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fence.spec	4 Mar 2005 17:28:25 -0000	1.4
+++ fence.spec	20 Apr 2005 16:39:47 -0000	1.5
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -9,21 +9,18 @@
 ##
 ###############################################################################
 ###############################################################################
-%define fence_find_requires %{_builddir}/fence-find-requires
-%define _use_internal_dependency_generator 0
 
 Name: fence
-Version: 1.5
-Release: 2
+Version: 1.27
+Release: 1
 License: GPL
 Group: System Environment/Base
 Summary: fence - The cluster I/O fencing system
 BuildRequires: cman-kernheaders ccs-devel
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
-ExcludeArch: s390 s390x ppc
+ExclusiveArch: i386 x86_64
 Source0: %{name}-%{version}.tar.gz
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -32,16 +29,11 @@
 %prep
 %setup -q
 
-%{__cat} <<EOF >%{fence_find_requires}
-#!/bin/sh
-%{__find_requires} | grep -v '^perl('
-exit 0
-EOF
-chmod +x %{fence_find_requires}
-%define __find_requires %{fence_find_requires}
-
 %build
 ./configure --mandir=%{_mandir}
+sed -i '/RELEASE_MAJOR/s/= .*/= %version/' make/defines.mk
+sed -i '/RELEASE_MINOR/s/= .*/= %release/' make/defines.mk
+sed -i '/RELEASE /s/= .*/= %version/' make/defines.mk
 make
 
 %install
@@ -51,6 +43,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add fenced
+
+%preun
+if [ "$1" = 0 ]; then
+        /sbin/chkconfig --del fenced
+fi
+
 %files
 %defattr(-,root,root,-)
 /sbin


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2004 21:53:02 -0000	1.4
+++ sources	20 Apr 2005 16:39:47 -0000	1.5
@@ -1 +1 @@
-b315592ae9137ceefc9422b2abe580bd  fence-1.5.tar.gz
+4d4af4dcad9392bdbfc880166e9a5e08  fence-1.27.tar.gz