rpms/cman/devel cman.spec,1.6,1.7 sources,1.5,1.6

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11211

Modified Files:
	cman.spec sources 
Log Message:
Merge from RHEL-4


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cman.spec	4 Mar 2005 17:28:38 -0000	1.6
+++ cman.spec	20 Apr 2005 16:44:13 -0000	1.7
@@ -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,9 +9,11 @@
 ##
 ###############################################################################
 ###############################################################################
+%define subversion pre33
+
 Name: cman
 Version: 1.0
-Release: 0.pre7.3
+Release: 0.pre33.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -20,20 +22,22 @@
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: ccs
-Requires: cman-kernel >= 2.6.9
-ExcludeArch: s390 s390x ppc
-Source0: %{name}-%{version}-pre7.tar.gz
-
+#Requires: cman-kernel >= 2.6.9
+ExclusiveArch: i386 ia64 x86_64
+Source0: %{name}-%{version}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 cman - The Cluster Manager
 
 %prep
-%setup -q -n %{name}-%{version}-pre7
+%setup -q -n %{name}-%{version}-%{subversion}
 
 %build
 ./configure --mandir=%{_mandir}
+sed -i '/RELEASE_MAJOR/s/= .*/= %version/' make/defines.mk
+sed -i '/RELEASE_MINOR/s/= .*/= 0.%{subversion}/' make/defines.mk
+sed -i '/RELEASE /s/= .*/= %version-0.%{subversion}/' make/defines.mk
 make
 
 %install
@@ -43,9 +47,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add cman
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del cman
+fi
+
 %files
 %defattr(-,root,root,-)
-# Binaries
 /sbin/cman_tool
 %config /etc/init.d/cman
 %doc
@@ -54,22 +65,28 @@
 %changelog
 * Mon Dec 20 2004 Chris Feist <cfeist at redhat.com>
 - Rebuild with new sources.
+
 * Mon Dec 13 2004 Chris Feist <cfeist at redhat.com>
 - Rebuild with new sources.
+
 * Thu Nov 18 2004 Chris Feist <cfeist at redhat.com>
 - various bug fixes (new upstream sources)
+
 * Fri Oct 22 2004 Chris Feist <cfeist at redhat.com>
 - various bug fixes (new upstream sources)
+
 * Mon Aug 16 2004 Jon Brassow <jbrassow at redhat.com>
 - update the requirements field
+
 * Fri Aug 13 2004 Jon Brassow <jbrassow at redhat.com>
 - various bug fixes (new upstream sources)
 - add man pages
+
 * Wed Jul 14 2004 Jon Brassow <jbrassow at redhat.com>
 - build for i386 and x86_64 only
+
 * Tue Jul 13 2004 Jon Brassow <jbrassow at redhat.com> 
 - New upstream sources
+
 * Thu Jun 17 2004 Jon Brassow <jbrassow at redhat.com> 
 - Initial build.
-
-


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2004 21:55:15 -0000	1.5
+++ sources	20 Apr 2005 16:44:13 -0000	1.6
@@ -1 +1 @@
-6926ad573ee54a625cb09980c78387e0  cman-1.0-pre7.tar.gz
+6a06d3664040246997983fa3609c9fc5  cman-1.0-pre33.tar.gz