diff --git a/heartbeat-doc-1.0.tar.gz b/heartbeat-doc-1.0.tar.gz new file mode 100644 index 0000000..7431472 --- /dev/null +++ b/heartbeat-doc-1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecddb0afb63f5ce4be3f7d955b4f87dbec8db04d8419ab42a7bc3ff5a60133cc +size 625250 diff --git a/pacemaker.changes b/pacemaker.changes index 058f85d..9982ece 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Nov 18 14:57:43 CET 2008 - abeekhof@suse.de + +- Add man pages for Pacemaker admin tools +- Update source tarball to revision: eda05459ce58 + + High: Core: Repair the ability to have comments in the configuration + + High: Tools: hb2openais: update logging and set logfile appropriately + + High: ais: Hook up the openais.conf config logging options + + High: ais: Zero out the PID of disconnecting clients + + High: cib: Ensure global updates cause a disk write when appropriate + + High: crmd: Ensure PE processing does not occur for all error cases in do_pe_invoke_callback + + High: crmd: Requests to the CIB should cause any prior PE calculations to be ignored + + Medium: PE: Prevent lsb scripts from being used in globally unique clones + + Medium: Tools: crm_mon - display the meaning of the operation's rc code instead of the status + + Medium: ais: Hook up the options for specifying the expected number of nodes and total quorum votes + + Medium: crmd: Fix the handling of unexpected PE exits to ensure the current CIB is stored + ------------------------------------------------------------------- Sat Nov 8 10:24:36 CET 2008 - abeekhof@suse.de diff --git a/pacemaker.spec b/pacemaker.spec index 3daabae..89ac10e 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -27,6 +27,7 @@ %define with_heartbeat_support 0 %define gname haclient %define uname hacluster +%define doc_pkg heartbeat-doc-1.0 %if 0%{?fedora_version} %define pkg_group System Environment/Daemons %else @@ -36,11 +37,12 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager Version: 1.0.1 -Release: 3 +Release: 4 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org Group: Productivity/Clustering/HA Source: pacemaker.tar.gz +Source2: %{doc_pkg}.tar.gz Source100: pacemaker.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -63,6 +65,9 @@ BuildRequires: rpm-devel %if 0%{?suse_version} == 1000 BuildRequires: lzo lzo-devel %endif +%if 0%{?suse_version} > 1100 +BuildRequires: docbook-xsl-stylesheets +%endif %if 0%{?suse_version} < 1020 BuildRequires: tcpd-devel %endif @@ -120,7 +125,7 @@ Authors: Andrew Beekhof %package -n libpacemaker-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later Summary: The Pacemaker scalable High-Availability cluster resource manager Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} @@ -146,7 +151,7 @@ Authors: %prep ########################################################### -%setup -n pacemaker +%setup -a 2 -n pacemaker -q ########################################################### %build @@ -185,12 +190,20 @@ export CFLAGS --with-hapkgversion=%{version} export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} +if [ -e /usr/share/xml/docbook/stylesheet/nwalsh/current ]; then + make -C %{doc_pkg} man +fi ########################################################### %install ########################################################### -#make DESTDIR=$RPM_BUILD_ROOT install-strip make DESTDIR=$RPM_BUILD_ROOT install +if [ -e %{doc_pkg}/cibadmin.8 ]; then + install -d $RPM_BUILD_ROOT/%{_mandir}/man8 + for file in `ls -1 %{doc_pkg}/*.8`; do + install -p -m 644 $file $RPM_BUILD_ROOT/%{_mandir}/man8 + done +fi chmod a+x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crm_primitive.py rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so ( @@ -254,8 +267,7 @@ rm -rf $RPM_BUILD_DIR/pacemaker %{_sbindir}/ptest %{_sbindir}/crm_shadow %{_sbindir}/cibpipe -%doc %{_mandir}/man8/cibadmin.8* -%doc %{_mandir}/man8/crm_resource.8* +%doc %{_mandir}/man8/*.8* %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm @@ -285,6 +297,20 @@ rm -rf $RPM_BUILD_DIR/pacemaker %{_libdir}/*.so %changelog +* Tue Nov 18 2008 abeekhof@suse.de +- Add man pages for Pacemaker admin tools +- Update source tarball to revision: eda05459ce58 + + High: Core: Repair the ability to have comments in the configuration + + High: Tools: hb2openais: update logging and set logfile appropriately + + High: ais: Hook up the openais.conf config logging options + + High: ais: Zero out the PID of disconnecting clients + + High: cib: Ensure global updates cause a disk write when appropriate + + High: crmd: Ensure PE processing does not occur for all error cases in do_pe_invoke_callback + + High: crmd: Requests to the CIB should cause any prior PE calculations to be ignored + + Medium: PE: Prevent lsb scripts from being used in globally unique clones + + Medium: Tools: crm_mon - display the meaning of the operation's rc code instead of the status + + Medium: ais: Hook up the options for specifying the expected number of nodes and total quorum votes + + Medium: crmd: Fix the handling of unexpected PE exits to ensure the current CIB is stored * Sat Nov 08 2008 abeekhof@suse.de - Update source tarball to revision: e21021b77657 + High: crmd: Erase the correct node's status section when it returns diff --git a/pacemaker.tar.gz b/pacemaker.tar.gz index 201d43e..c6009bb 100644 --- a/pacemaker.tar.gz +++ b/pacemaker.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c63e2d2ae593600c45d24a98e596cde73c88e00ded0d7e93d946acb97755ce6 -size 1815661 +oid sha256:677d6fabd1ad99138bd6e5b85679bfbac549a1bfaf4807c928783ec2b88226cb +size 1829353