rpms/cluster/devel .cvsignore, 1.5, 1.6 cluster.spec, 1.9, 1.10 sources, 1.5, 1.6 cluster.logrotate, 1.1, NONE

[Fabio M. Di Nitto (fabbione)]

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27448

Modified Files:
	.cvsignore cluster.spec sources 
Removed Files:
	cluster.logrotate 
Log Message:
Prepare new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Jun 2008 07:15:32 -0000	1.5
+++ .cvsignore	15 Jul 2008 11:17:04 -0000	1.6
@@ -1 +1 @@
-cluster-2.99.05.tar.gz
+cluster-2.99.06.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cluster.spec	3 Jul 2008 11:47:34 -0000	1.9
+++ cluster.spec	15 Jul 2008 11:17:04 -0000	1.10
@@ -18,13 +18,12 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.05
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 2.99.06
+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}.tar.gz
-Source1: cluster.logrotate
 
 ## Setup/build bits
 
@@ -40,7 +39,7 @@
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: openais-devel >= 0.84-1 openldap-devel
+BuildRequires: openais-devel >= 0.84-2 openldap-devel
 %if %{buildxen}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
 %endif
@@ -70,11 +69,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster
 # install logging bits
 mkdir -p $RPM_BUILD_ROOT/var/log/cluster
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m 644 -p %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman
 
 ## tree fix up
+# logrotate name
+mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster.logrotate \
+	$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman
 # remove static libraries
 find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \;
 # fix library permissions or fedora strip helpers won't work.
@@ -83,8 +82,11 @@
 find $RPM_BUILD_ROOT -name "*.lcrso" -exec chmod 0755 {} \;
 # fix libfence permissions
 chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py
+chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl
 # do not ship fence_vmware for now
 find $RPM_BUILD_ROOT -name "fence_vmware" -exec rm {} \;
+# remove docs
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,9 +105,9 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: openais >= 0.84 sg3_utils
+Requires: openais >= 0.84-2 sg3_utils
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils
+Requires: pexpect net-snmp-utils pyOpenSSL
 
 %description -n cman
 Red Hat Cluster Manager
@@ -131,7 +133,7 @@
 
 %files -n cman
 %defattr(-,root,root,-)
-%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries doc/*
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence doc/*.txt config/plugins/ldap/*.ldif
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %{_sysconfdir}/rc.d/init.d/qdiskd
@@ -140,6 +142,7 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 /sbin/ccs*
 /sbin/cman*
+/sbin/confdb2ldif
 /sbin/dlm*
 /sbin/fence*
 /sbin/gfs_control*
@@ -154,6 +157,7 @@
 %{_mandir}/man7/*
 %{_mandir}/man8/ccs*
 %{_mandir}/man8/cman*
+%{_mandir}/man8/confdb2ldif*
 %{_mandir}/man8/dlm*
 %{_mandir}/man8/fence*
 %{_mandir}/man8/gfs_control*
@@ -200,7 +204,7 @@
 
 %files -n rgmanager
 %defattr(-,root,root,-)
-%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries rgmanager/README rgmanager/errors.txt
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
 %{_sysconfdir}/rc.d/init.d/rgmanager
 /sbin/clu*
 /sbin/rg_test
@@ -230,7 +234,7 @@
 
 %files -n gfs2-utils
 %defattr(-,root,root,-)
-%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs2
 /sbin/*gfs2*
 %{_mandir}/man8/*gfs2*
@@ -259,7 +263,7 @@
 
 %files -n gfs-utils
 %defattr(-,root,root,-)
-%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs
 /sbin/gfs_*
 /sbin/*.gfs
@@ -280,15 +284,20 @@
 
 %files -n gnbd-utils
 %defattr(-,root,root,-)
-%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries
+%doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 # %%{_sysconfdir}/rc.d/init.d/gfs
 /sbin/gnbd_*
 %{_mandir}/man8/gnbd*
 
 %changelog
-* Thu Jul  3 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.05-2
+* Tue Jul 15 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.06-1
+- New upstream release.
+- BR on new openais for logging features.
+- drop local logrotate snippet in favour of upstream one.
+- cman Requires: PyOpenSSL for telnet_ssl wrapper.
 - cman Requires: pexpect and net-snmp-utils for fence agents.
   Thanks to sendro on IRC for spotting the issue.
+- Another cleanup round for docs
 
 * Tue Jun 24 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.05-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Jun 2008 07:15:32 -0000	1.5
+++ sources	15 Jul 2008 11:17:04 -0000	1.6
@@ -1 +1 @@
-4e0f41ee31c4235b33406eac1a6648e6  cluster-2.99.05.tar.gz
+ff0b5733f15043f04f5c84c481dd88ba  cluster-2.99.06.tar.gz


--- cluster.logrotate DELETED ---