rpms/cluster/devel .cvsignore, 1.29, 1.30 cluster.spec, 1.59, 1.60 sources, 1.30, 1.31 cp_workaround.diff, 1.1, NONE

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1975

Modified Files:
	.cvsignore cluster.spec sources 
Removed Files:
	cp_workaround.diff 
Log Message:
New upstream release

spec file updates:
 * drop cp_workaround patch
 * stop shipping rgmanager from cluster
 * move dlm udev rules in clusterlib where they belong
 * enable pacemaker components build
 * ship 2 new rpms: dlm-pcmk and gfs-pcmk for pacemaker integration




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	24 Aug 2009 04:31:19 -0000	1.29
+++ .cvsignore	25 Sep 2009 10:26:37 -0000	1.30
@@ -1 +1 @@
-cluster-3.0.2.tar.gz
+cluster-3.0.3.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- cluster.spec	24 Aug 2009 06:51:35 -0000	1.59
+++ cluster.spec	25 Sep 2009 10:26:37 -0000	1.60
@@ -18,13 +18,12 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.2
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
-Patch0: cp_workaround.diff
 
 ## Setup/build bits
 
@@ -37,17 +36,19 @@ BuildRequires: libxml2-devel ncurses-dev
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
+BuildRequires: cluster-glue-libs-devel pacemaker-libs-devel glib2-devel
 
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
-%patch0 -p1
 
 %build
 ./configure \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
+  --enable_pacemaker \
   --without_fence_agents \
+  --without_rgmanager \
   --without_resource_agents \
   --without_kernel_modules \
   --disable_kernel_check
@@ -94,8 +95,8 @@ Summary: Red Hat Cluster Manager
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 1.0.0-1
-Requires: openais >= 1.0.0-1
+Requires: corosync >= 1.0.1-1
+Requires: openais >= 1.0.2-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
 Requires: fence-agents
@@ -119,14 +120,15 @@ fi
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %dir %{_sysconfdir}/cluster/cman-notify.d
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 %{_sbindir}/ccs*
 %{_sbindir}/cman*
 %{_sbindir}/confdb2ldif
-%{_sbindir}/dlm*
+%{_sbindir}/dlm_controld
+%{_sbindir}/dlm_tool
 %{_sbindir}/fence*
-%{_sbindir}/gfs_control*
+%{_sbindir}/gfs_control
+%{_sbindir}/gfs_controld
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
@@ -148,7 +150,7 @@ fi
 %package -n clusterlib
 Group: System Environment/Libraries
 Summary: The Red Hat Cluster libraries
-Conflicts: cman < 3.0.0-5.alpha4
+Conflicts: cman < 3.0.3-1
 Provides: cmanlib = %{version}
 Obsoletes: cmanlib < 3.0.0-5.alpha4
 
@@ -158,6 +160,7 @@ The Red Hat Cluster libraries package
 %files -n clusterlib
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %{_libdir}/libcman.so.*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
@@ -198,37 +201,33 @@ The Red Hat Cluster libraries developmen
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
 
-%package -n rgmanager
+%package -n dlm-pcmk
 Group: System Environment/Base
-Summary: Open Source HA Resource Group Failover for Red Hat Cluster
+Summary: DLM pacemaker integration layer
 License: GPLv2+ and LGPLv2+
-Requires: chkconfig initscripts
-Requires: cman resource-agents
-Requires(post): chkconfig
-Requires(preun): initscripts
-Requires(preun): chkconfig
 
-%description -n rgmanager
-Red Hat Resource Group Manager provides high availability of critical server
-applications in the event of planned or unplanned system downtime.
+%description -n dlm-pcmk
+The dlm-pcmk package contains the daemon that allows pacemaker
+to drive the Distributed Lock Manager.
 
-%post -n rgmanager
-/sbin/chkconfig --add rgmanager
+%files -n dlm-pcmk
+%defattr(-,root,root,-)
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
+%{_sbindir}/dlm_controld.pcmk
 
-%preun -n rgmanager
-if [ "$1" = 0 ]; then
-	/sbin/service rgmanager stop >/dev/null 2>&1
-	/sbin/chkconfig --del rgmanager
-fi
+%package -n gfs-pcmk
+Group: System Environment/Base
+Summary: GFS pacemaker integration layer
+License: GPLv2+ and LGPLv2+
+
+%description -n gfs-pcmk
+The gfs-pcmk package contains the daemon that allows pacemaker
+to drive the GFS1/GFS2 File Systems.
 
-%files -n rgmanager
+%files -n gfs-pcmk
 %defattr(-,root,root,-)
-%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
-%{_sysconfdir}/rc.d/init.d/rgmanager
-%{_sbindir}/clu*
-%{_sbindir}/rgmanager
-%{_sbindir}/rg_test
-%{_mandir}/man8/clu*
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
+%{_sbindir}/gfs_controld.pcmk
 
 %package -n gfs2-utils
 Group: System Environment/Kernel
@@ -303,6 +302,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+- spec file updates:
+  * drop cp_workaround patch
+  * stop shipping rgmanager from cluster
+  * move dlm udev rules in clusterlib where they belong
+  * enable pacemaker components build
+  * ship 2 new rpms: dlm-pcmk and gfs-pcmk for pacemaker integration
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
 - Add temporary workaround to install symlinks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	24 Aug 2009 04:31:19 -0000	1.30
+++ sources	25 Sep 2009 10:26:37 -0000	1.31
@@ -1 +1 @@
-d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz
+fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz


--- cp_workaround.diff DELETED ---