rpms/rgmanager/F-9 .cvsignore, 1.14, 1.15 rgmanager.spec, 1.44, 1.45 sources, 1.23, 1.24 rgmanager-1.9.31-norun.patch, 1.1, NONE

Fri May 30 08:23:31 UTC 2008

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19288

Modified Files:
	.cvsignore rgmanager.spec sources 
Removed Files:
	rgmanager-1.9.31-norun.patch 
Log Message:
Prepare update to 2.03.03 for F-9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15

--- .cvsignore	9 Oct 2006 18:51:45 -0000	1.14
+++ .cvsignore	30 May 2008 08:22:46 -0000	1.15
@@ -1 +1 @@
-rgmanager-2.0.9.tar.gz
+cluster-2.03.03.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/rgmanager.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rgmanager.spec	19 Feb 2008 12:49:10 -0000	1.44
+++ rgmanager.spec	30 May 2008 08:22:46 -0000	1.45
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2008 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
@@ -11,65 +11,85 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 2.0.23
-Release: 3%{?dist}
-License: GPL,LGPL
-Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
-Requires: chkconfig initscripts glibc ncurses libxml2 bash grep sed gawk
-Requires: cman
-Requires: net-tools mount /sbin/findfs /bin/bash
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Provides: rgmanager
-Obsoletes: clumanager
-BuildRequires: glibc-devel ncurses-devel libxml2-devel /bin/grep
-BuildRequires: cman-devel
-#ExclusiveArch: %{ix86} x86_64
-Source: %{name}-%{version}.tar.gz
-Patch1: rgmanager-1.9.31-norun.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-%description
-Red Hat Resource Group Manager provides high availability of critical server
-applications in the event of planned or unplanned system downtime.
+Version: 2.03.03
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+License: GPLv2+
+Group: System Environment/Base
+URL: http://sources.redhat.com/cluster/wiki/
+Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
+Requires: chkconfig initscripts glibc ncurses bash grep sed gawk
+Requires: cman >= 2.03.03
+Requires: net-tools mount e2fsprogs
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+
+## Setup/build bits
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Build dependencies
+BuildRequires: perl
+BuildRequires: glibc-devel
+BuildRequires: libxml2-devel ncurses-devel slang-devel
 
 %prep
-%setup -q
-%patch1 -p1 -b .norun
+%setup -q -n cluster-%{version}
 
 %build
-./configure --kernel_src=/usr/src/kernels/2.6.16-1.2236_FC6-i686/
+# for legacy reasons, all binaries have always been installed in /sbin
+./configure \
+  --initddir=%{_sysconfdir}/rc.d/init.d \
+  --libdir=%{_libdir} \
+  --openaislibdir=%{_libdir}/openais \
+  --without_gfs \
+  --without_gnbd \
+  --disable_kernel_check
 
-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
+make rgmanager
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d
-mv -f $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d/
+rm -rf $RPM_BUILD_ROOT
+make -C rgmanager install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%description
+Red Hat Resource Group Manager provides high availability of critical server
+applications in the event of planned or unplanned system downtime.
+
 %post
 /sbin/chkconfig --add rgmanager
 
 %preun
 if [ "$1" = 0 ]; then
-        /sbin/chkconfig --del rgmanager
+	/sbin/service rgmanager stop >/dev/null 2>&1
+	/sbin/chkconfig --del rgmanager
 fi
 
 %files
-%defattr(-,root,root)
-%doc README AUTHORS COPYING errors.txt
-%{_mandir}/*/*
-/usr/sbin/
-/usr/share/cluster
-%config /etc/rc.d/init.d/rgmanager
+%defattr(-,root,root,-)
+%doc rgmanager/README rgmanager/AUTHORS rgmanager/COPYING rgmanager/errors.txt
+%{_sysconfdir}/rc.d/init.d/rgmanager
+/usr/sbin/clu*
+/usr/sbin/rg_test
+%{_datadir}/cluster
+%{_mandir}/man8/clu*
 
 %changelog
+* Fri May 30 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.03-1
+- New upstream release
+- Cleanup spec file
+- Update Requires to use packages rather than pointing at files
+- Update licence tag
+- Drop local patches that are now upstream
+- Update build section to use standard macros and remove need of kernel heaeders
+- Cleanup install target and remove local hacks
+- Fix preun section to stop rgmanager
+- Cleanup files section to use macros
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.23-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 Feb 2007 20:42:20 -0000	1.23
+++ sources	30 May 2008 08:22:46 -0000	1.24
@@ -1 +1 @@
-db13cc28d78ffc78e7228a1e47efc296  rgmanager-2.0.23.tar.gz
+77439dadf16204c3f68e7d4f3fdfd33d  cluster-2.03.03.tar.gz


--- rgmanager-1.9.31-norun.patch DELETED ---


