rpms/cluster/devel .cvsignore, 1.22, 1.23 cluster.spec, 1.47, 1.48 sources, 1.22, 1.23

[Fabio M. Di Nitto]

Author: fabbione

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

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

spec file cleanup



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	9 Mar 2009 10:32:56 -0000	1.22
+++ .cvsignore	24 Mar 2009 09:06:11 -0000	1.23
@@ -1 +1 @@
-cluster-3.0.0.beta1.tar.gz
+cluster-3.0.0.rc1.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cluster.spec	9 Mar 2009 10:32:56 -0000	1.47
+++ cluster.spec	24 Mar 2009 09:06:11 -0000	1.48
@@ -14,12 +14,12 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag beta1
+%define alphatag rc1
 
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 14%{?alphatag:.%{alphatag}}%{?dist}
+Release: 15%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -27,14 +27,14 @@
 
 ## Setup/build bits
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: corosynclib-devel >= 0.94-3
-BuildRequires: openaislib-devel >= 0.93-2
+BuildRequires: corosynclib-devel >= 0.95-1
+BuildRequires: openaislib-devel >= 0.94-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 
 %prep
@@ -45,7 +45,6 @@
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-  --corosynclibdir=%{_libdir}/corosync \
   --openaislibdir=%{_libdir}/openais \
   --without_fence_agents \
   --without_resource_agents \
@@ -56,35 +55,35 @@
 CFLAGS="$(echo '%{optflags}')" make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 ## tree fix up
 # add config dir
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster
+mkdir -p %{buildroot}%{_sysconfdir}/cluster
 # install logging bits
-mkdir -p $RPM_BUILD_ROOT/var/log/cluster
+mkdir -p %{buildroot}/var/log/cluster
 # add cmanotifyd directory
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster/cman-notify.d
+mkdir -p %{buildroot}%{_sysconfdir}/cluster/cman-notify.d
 # logrotate name
-mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster \
-	$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman
+mv %{buildroot}%{_sysconfdir}/logrotate.d/cluster \
+	%{buildroot}%{_sysconfdir}/logrotate.d/cman
 # remove static libraries
-find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \;
+find %{buildroot} -name "*.a" -exec rm {} \;
 # fix library permissions or fedora strip helpers won't work.
-find $RPM_BUILD_ROOT -name "lib*.so.*" -exec chmod 0755 {} \;
+find %{buildroot} -name "lib*.so.*" -exec chmod 0755 {} \;
 # fix lcrso permissions or fedora strip helpers won't work.
-find $RPM_BUILD_ROOT -name "*.lcrso" -exec chmod 0755 {} \;
+find %{buildroot} -name "*.lcrso" -exec chmod 0755 {} \;
 # remove docs
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster
+rm -rf %{buildroot}/usr/share/doc/cluster
 # cleanup perl bindings bits
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name CCS.so -exec chmod 755 {} \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -type f -name perllocal.pod -exec rm -f {} \;
+find %{buildroot} -type f -name '*.bs' -a -empty -exec rm -f {} \;
+find %{buildroot} -type f -name CCS.so -exec chmod 755 {} \;
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 ## Runtime and subpackages section
 
@@ -100,8 +99,8 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 0.94-3
-Requires: openais >= 0.93-2
+Requires: corosync >= 0.95-1
+Requires: openais >= 0.94-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
@@ -111,15 +110,12 @@
 
 %post -n cman
 /sbin/chkconfig --add cman
-/sbin/chkconfig --add qdiskd
 /sbin/ldconfig > /dev/null
 
 # make sure to stop cman always as last
 %preun -n cman
 if [ "$1" = 0 ]; then
-	/sbin/service qdiskd stop >/dev/null 2>&1
 	/sbin/service cman stop >/dev/null 2>&1
-	/sbin/chkconfig --del qdiskd
 	/sbin/chkconfig --del cman
 fi
 
@@ -130,7 +126,6 @@
 %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
 %dir %{_sysconfdir}/cluster/cman-notify.d
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
@@ -146,7 +141,6 @@
 %{perl_vendorarch}/*
 %dir /var/log/cluster
 %{_mandir}/man5/*
-%{_mandir}/man7/*
 %{_mandir}/man8/ccs*
 %{_mandir}/man8/cman*
 %{_mandir}/man8/confdb2ldif*
@@ -314,6 +308,13 @@
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-15.rc1
+- New upstream release.
+- Update corosync/openais BuildRequires and Requires.
+- Drop --corosynclibdir from configure. Libs are now in standard path.
+- Update BuildRoot usage to preferred versions/names
+- Drop qdisk init script. Now merged in cman init from upstream.
+
 * Mon Mar  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14.alpha7
 - New upstream release.
 - Update corosync/openais BuildRequires and Requires.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Mar 2009 10:32:56 -0000	1.22
+++ sources	24 Mar 2009 09:06:11 -0000	1.23
@@ -1 +1 @@
-cb6e492b8995c7e3b69005a93737e46f  cluster-3.0.0.beta1.tar.gz
+ca40dcee847586cf1c8dd7ee965c3252  cluster-3.0.0.rc1.tar.gz