rpms/cluster-glue/devel .cvsignore, 1.5, 1.6 cluster-glue.spec, 1.11, 1.12 sources, 1.5, 1.6

Andrew Beekhof beekhof at fedoraproject.org
Tue Jan 12 09:55:23 UTC 2010 

Author: beekhof

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

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
Refresh with latest version from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Oct 2009 14:44:26 -0000	1.5
+++ .cvsignore	12 Jan 2010 09:55:22 -0000	1.6
@@ -1 +1 @@
-b79635605337.tar.bz2
+aa1f9dee2793.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cluster-glue.spec	23 Nov 2009 13:15:32 -0000	1.11
+++ cluster-glue.spec	12 Jan 2010 09:55:23 -0000	1.12
@@ -4,19 +4,19 @@
 
 # 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 12
+%global specversion 1
 %global upstreamprefix Reusable-Cluster-Components-
-%global upstreamversion b79635605337
+%global upstreamversion aa1f9dee2793
 
 # Keep around for when/if required
-%global alphatag %{upstreamversion}.hg
+#global alphatag %{upstreamversion}.hg
 
 Name:		cluster-glue
 Summary:	Reusable cluster components
-Version:	1.0
+Version:	1.0.2
 Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
-Url:		http://www.clusterlabs.org
+Url:		http://linux-ha.org/wiki/Cluster_Glue
 Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 
@@ -33,8 +33,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 # Build dependencies
 Requires: perl-TimeDate
 BuildRequires: automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
-BuildRequires: bzip2-devel glib2-devel e2fsprogs-devel python-devel libxml2-devel
-BuildRequires: OpenIPMI-devel libnet-devel net-snmp-devel libcurl-devel openhpi-devel
+BuildRequires: bzip2-devel glib2-devel python-devel libxml2-devel
+
+# For documentation
+BuildRequires: libxslt docbook-style-xsl
+
+# For additional Stonith plugins
+BuildRequires: net-snmp-devel OpenIPMI-devel openhpi-devel libcurl-devel
 
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
 BuildRequires: libuuid-devel
@@ -64,7 +69,9 @@ make install DESTDIR=%{buildroot}
 # Dont package static libs
 find %{buildroot} -name '*.a' -exec rm {} \;
 find %{buildroot} -name '*.la' -exec rm {} \;
-find %{buildroot} -type f -exec chrpath -d {} >/dev/null 2>&1 \;
+
+# Don't package things we wont support
+rm -f %{buildroot}/%{_libdir}/stonith/plugins/stonith2/rhcs.*
 
 %clean
 rm -rf %{buildroot}
@@ -99,16 +106,17 @@ standards, and an interface to common ST
 %dir %{_libdir}/stonith
 %dir %{_libdir}/stonith/plugins
 %dir %{_libdir}/stonith/plugins/stonith2
+%{_datadir}/cluster-glue/ha_log.sh
 %{_libdir}/stonith/plugins/external
 %{_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
-%{_datadir}/heartbeat/combine-logs.pl
+%dir %{_datadir}/cluster-glue
+%{_datadir}/cluster-glue/ha_cf_support.sh
+%{_datadir}/cluster-glue/openais_conf_support.sh
+%{_datadir}/cluster-glue/utillib.sh
+%{_datadir}/cluster-glue/combine-logs.pl
 
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
@@ -116,9 +124,9 @@ standards, and an interface to common ST
 %dir %attr (0700, nobody, %{nogroup})	%{_var}/lib/heartbeat/cores/nobody
 %dir %attr (0700, %{uname}, %{gname})	%{_var}/lib/heartbeat/cores/%{uname}
 
-%doc %{_datadir}/doc/glue/stonith
-%doc %{_mandir}/man8/*
+%doc %{_datadir}/doc/cluster-glue/stonith
 %doc %{_mandir}/man1/*
+%doc %{_mandir}/man8/*
 %doc AUTHORS
 %doc COPYING
 
@@ -163,11 +171,10 @@ such as Pacemaker.
 
 %files -n cluster-glue-libs-devel
 %defattr(-,root,root)
-%dir %{_libdir}/glue
-%dir %{_libdir}/glue/plugins
-%dir %{_libdir}/glue/plugins/test
 %dir %{_libdir}/heartbeat
-%dir %{_datadir}/glue
+%dir %{_libdir}/heartbeat/plugins
+%dir %{_libdir}/heartbeat/plugins/test
+%dir %{_datadir}/cluster-glue
 %{_libdir}/lib*.so
 %{_libdir}/heartbeat/ipctest
 %{_libdir}/heartbeat/ipctransientclient
@@ -179,13 +186,36 @@ such as Pacemaker.
 %{_includedir}/heartbeat
 %{_includedir}/stonith
 %{_includedir}/pils
-%{_datadir}/glue/lrmtest
-%{_libdir}/glue/plugins/test/test.so
+%{_datadir}/cluster-glue/lrmtest
+%{_libdir}/heartbeat/plugins/test/test.so
+
 %doc AUTHORS
 %doc COPYING
 %doc COPYING.LIB
 
 %changelog
+* Mon Jan 11 2010 Andrew Beekhof <andrew at beekhof.net> - 1.0.2-1
+- Suppress unsupported stonith plugins
+- Update to latest upstream release: aa1f9dee2793
+  + High: stonith: add ha_log.sh for external plugins (LF 1971)
+  + High: stonith: external plugins log using ha_log.sh (LF 2294)
+  + High: stonith: external/dracmc-telnet: new stonith plugin for Dell Drac/MC Blade Enclosure and Cyclades terminal server
+  + High: stonith: external/riloe: workaround for the iLO double close of RIBCL element (bnc#553340)
+  + High: stonith: external: log messages immediately on manage and status calls
+  + High: stonith: external: log output of plugins (bnc#548699,553340)
+  + Medium: LRM: lrmd: log outcome of monitor once an hour
+  + Medium: LRM: lrmd: remove operation history on client unregister and flushing all operations (LF 2161)
+  + Medium: LRM: lrmd: restore reset scheduler for children (bnc#551971, lf#2296)
+  + Medium: LRM: raexec: close the logd fd too when executing agents (LF 2267)
+  + Medium: Tools: hb_report: add -V (version) option and add support for corosync
+  + Medium: external STONITH plugins: remove dependency on .ocf-shellfuncs (LF2249)
+  + Medium: stonith: cyclades: fix for support for newer PM10 firmware (LF 1938)
+  + Medium: stonith: external/ipmi: add explanation on reset and power off (LF 2071)
+  + Medium: stonith: external/riloe: make sure that host is turned on after power off/on reset (LF 2282)
+  + Medium: stonith: meatclient: add -w option to wait until it can connect
+  + Medium: stonith: print complete metadata for -m (LF 2279)
+  + Medium: stonith: stonith: add -m option to display metadata
+
 * Mon Nov 23 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.12.b79635605337.hg
 - Correctly select libuuid for building on rhel >=6 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Oct 2009 14:44:26 -0000	1.5
+++ sources	12 Jan 2010 09:55:23 -0000	1.6
@@ -1 +1 @@
-25c996c1a371e842dc3add2df593782f  b79635605337.tar.bz2
+72f6ed98b539fd2ff027d9d62cbf0e1d  aa1f9dee2793.tar.bz2

More information about the scm-commits mailing list