rpms/gulm/devel gulm.spec,1.5,1.6 sources,1.5,1.6

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gulm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5423

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


Index: gulm.spec
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gulm.spec	21 Dec 2004 21:59:27 -0000	1.5
+++ gulm.spec	20 Apr 2005 17:35:30 -0000	1.6
@@ -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 pre28
+
 Name: gulm
 Version: 1.0
-Release: 0.pre6.2
+Release: 0.pre28.1
 License: GPL
 Group: System Environment/Daemons
 Summary: gulm - One possible lock manager for GFS
@@ -19,9 +21,8 @@
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: ccs
-ExcludeArch: s390 s390x ppc
-Source0: %{name}-%{version}-pre6.tar.gz
-
+ExclusiveArch: i386 ia64 x86_64
+Source0: %{name}-%{version}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -35,10 +36,13 @@
 gulm libraries
 
 %prep
-%setup -q -n %{name}-%{version}-pre6
+%setup -q -n %{name}-%{version}-%{subversion}
 
 %build
 ./configure --libdir=%{_libdir} --incdir=%{_includedir} --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
@@ -48,6 +52,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add lock_gulmd
+
+%preun
+if [ "$1" = 0 ]; then
+        /sbin/chkconfig --del lock_gulmd
+fi
+
 %files
 %defattr(-,root,root,-)
 /sbin/gulm_tool
@@ -55,8 +67,8 @@
 %{_mandir}/man5/lock_gulmd.5.gz
 %{_mandir}/man8/gulm_tool.8.gz
 %{_mandir}/man8/lock_gulmd.8.gz
+/usr/%{_lib}/libgulm.so*
 %config /etc/init.d/lock_gulmd
-%doc
 
 %files devel
 %defattr(-,root,root,-)
@@ -67,17 +79,21 @@
 %changelog
 * Mon Dec 20 2004 Chris Feist <cfeist at redhat.com>
 - Rebuild for with new sources.
+
 * Mon Dec 13 2004 Chris Feist <cfeist at redhat.com>
 - Rebuild for 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> 
 - add requires field
+
 * Sat Aug 14 2004 Jon Brassow <jbrassow at redhat.com> 
 - various bug fixes (new upstream sources)
+
 * Thu Jun 17 2004 Jon Brassow <jbrassow at redhat.com> 
 - Initial build.
-
-


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2004 21:59:27 -0000	1.5
+++ sources	20 Apr 2005 17:35:30 -0000	1.6
@@ -1 +1 @@
-2fc9561e5ec46219baeed37e69837c05  gulm-1.0-pre6.tar.gz
+3d669043c5ede3410b4bc39bd4232e22  gulm-1.0-pre28.tar.gz