rpms/cluster-glue/devel .cvsignore, 1.3, 1.4 cluster-glue.spec, 1.4, 1.5 sources, 1.3, 1.4

Mon Aug 17 14:40:40 UTC 2009

Author: beekhof

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

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
Refresh sources and include directives for upgrading from combined heartbeat packages in Fedora11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	10 Aug 2009 13:37:09 -0000	1.3
+++ .cvsignore	17 Aug 2009 14:40:40 -0000	1.4
@@ -1 +1 @@
-75cab275433e.tar.bz2
+d97b9dea436e.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cluster-glue.spec	10 Aug 2009 13:37:09 -0000	1.4
+++ cluster-glue.spec	17 Aug 2009 14:40:40 -0000	1.5
@@ -4,8 +4,9 @@
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with: hg archive -t tgz -p "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
+%global specversion 9
 %global upstreamprefix Reusable-Cluster-Components-
-%global upstreamversion 75cab275433e
+%global upstreamversion d97b9dea436e
 
 # Keep around for when/if required
 %global alphatag %{upstreamversion}.hg
@@ -13,12 +14,18 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}8%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 
+# Directives to allow upgrade from combined heartbeat packages in Fedora11
+Provides:	heartbeat-stonith = 2:%{version}-%{release}
+Provides:	heartbeat-pils = 2:%{version}-%{release}
+Obsoletes:	heartbeat-stonith < 2:1.0-0.9
+Obsoletes:	heartbeat-pils < 2:1.0-0.9
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -39,7 +46,7 @@ BuildRequires: libuuid-devel
 
 ./autogen.sh
 
-%{_configure}	CFLAGS="${CFLAGS} $(echo '%{optflags}')" \
+%{configure}	CFLAGS="${CFLAGS} $(echo '%{optflags}')" \
 		--enable-fatal-warnings=no   \
 		--localstatedir=%{_var}      \
 		--with-daemon-group=%{gname} \
@@ -72,9 +79,13 @@ standards, and an interface to common ST
 %files
 %defattr(-,root,root)
 %{_sbindir}/ha_logger
+%{_sbindir}/hb_report
 %{_sbindir}/lrmadmin
 %{_sbindir}/meatclient
+%{_sbindir}/sbd
 %{_sbindir}/stonith
+%{_sysconfdir}/init.d/logd
+
 %dir %{_libdir}/heartbeat
 %dir %{_libdir}/heartbeat/plugins
 %dir %{_libdir}/heartbeat/plugins/RAExec
@@ -83,6 +94,7 @@ standards, and an interface to common ST
 %{_libdir}/heartbeat/ha_logd
 %{_libdir}/heartbeat/plugins/RAExec/*.so
 %{_libdir}/heartbeat/plugins/InterfaceMgr/*.so
+
 %dir %{_libdir}/stonith
 %dir %{_libdir}/stonith/plugins
 %dir %{_libdir}/stonith/plugins/stonith2
@@ -90,12 +102,19 @@ standards, and an interface to common ST
 %{_libdir}/stonith/plugins/stonith2/*.so
 %{_libdir}/stonith/plugins/stonith2/*.py*
 %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
+
+%dir %{_datadir}/heartbeat
+%{_datadir}/heartbeat/ha_cf_support.sh
+%{_datadir}/heartbeat/openais_conf_support.sh
+%{_datadir}/heartbeat/utillib.sh
+
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
 %dir %attr (0700, root, root)		%{_var}/lib/heartbeat/cores/root
 %dir %attr (0700, nobody, %{nogroup})	%{_var}/lib/heartbeat/cores/nobody
 %dir %attr (0700, %{uname}, %{gname})	%{_var}/lib/heartbeat/cores/%{uname}
-%doc %{_datadir}/doc/stonith
+
+%doc %{_datadir}/doc/glue/stonith
 %doc %{_mandir}/man8/*
 %doc %{_mandir}/man1/*
 %doc AUTHORS
@@ -165,6 +184,31 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.9.d97b9dea436e.hg
+- Include relevant provides: and obsoletes: directives for heartbeat
+- Update the tarball from upstream to version d97b9dea436e
+  + Include license files
+  + Fix error messages in autogen.sh
+  + High (bnc#501723): Tools: hb_report: collect archived logs too
+  + Medium: clplumbing: check input when creating IPC channels
+  + Medium (bnc#510299): stonith: set G_SLICE to always-malloc to avoid bad interaction with the threaded openhpi
+  + Med: hb_report: report on more packages and with more state.
+  + The -E option to lrmadmin does not take an argument
+  + Provide a default value for docdir and ensure it is expanded
+  + Low: clplumbing: fix a potential resource leak in cl_random (bnc#525393).
+  + Med: hb_report: Include dlm_tool debugging information if available.
+  + hb_report: Include more possible error output.
+  + Medium: logd: add init script and example configuration file.
+  + High: logd: Fix init script. Remove apphbd references.
+  + logd: configuration file is optional.
+  + logd: print status on finished operations.
+  + High: sbd: actually install the binary.
+  + Medium: stonith: remove references to heartbeat artifacts.
+  + High: hb_report: define HA_NOARCHBIN
+  + hb_report: correct syntax error.
+  + hb_report: Include details about more packages even.
+  + hb_report: report corosync packages too.
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.8.75cab275433e.hg
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 13:37:09 -0000	1.3
+++ sources	17 Aug 2009 14:40:40 -0000	1.4
@@ -1 +1 @@
-1b472f73e6c570f0169edc7d53094470  75cab275433e.tar.bz2
+4983dda666e45a491933fc121a386bc3  d97b9dea436e.tar.bz2


