rpms/pacemaker/F-12 .cvsignore, 1.5, 1.6 pacemaker.spec, 1.7, 1.8 sources, 1.5, 1.6
Andrew Beekhof
beekhof at fedoraproject.org
Thu Oct 29 12:57:06 UTC 2009
Author: beekhof
Update of /cvs/pkgs/rpms/pacemaker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20595/F-12
Modified Files:
.cvsignore pacemaker.spec sources
Log Message:
Update with the results of CoroSync integration testing
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 13 Oct 2009 11:53:31 -0000 1.5
+++ .cvsignore 29 Oct 2009 12:57:05 -0000 1.6
@@ -1 +1 @@
-38cd629e5c3c.tar.bz2
+ee19d8e83c2a.tar.bz2
Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/pacemaker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pacemaker.spec 13 Oct 2009 11:53:31 -0000 1.7
+++ pacemaker.spec 29 Oct 2009 12:57:05 -0000 1.8
@@ -2,26 +2,29 @@
%global uname hacluster
%global with_ais_support 1
%global with_heartbeat_support 1
-# Enable heartbeat support once it builds against cluster-glue
+%global pcmk_docdir %{_docdir}/%{name}
-# 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 "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 3
-%global upstreamprefix Pacemaker-1-0-
-%global upstreamversion 38cd629e5c3c
+%global specversion 4
+%global upstream_version ee19d8e83c2a
+%global upstream_prefix Pacemaker-1-0-
# Keep around for when/if required
-#global alphatag %{upstreamversion}.hg
+#global alphatag %{upstream_version}.hg
+
+%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+
+# When downloading directly from Mercurial, it will automatically add a prefix
+# Invoking 'hg archive' wont but you can add one with:
+# hg archive -t tgz -p "$upstream_prefix-$upstream_version" -r $upstream_version $upstream_version.tar.gz
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: 1.0.5
-Release: %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release: %{pcmk_release}
License: GPLv2+ and LGPLv2+
Url: http://www.clusterlabs.org
Group: System Environment/Daemons
-Source0: http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstreamversion}.tar.bz2
+Source0: http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on
Requires(pre): cluster-glue
@@ -101,11 +104,11 @@ when related resources fail and can be c
resource health.
%prep
-%setup -q -n %{upstreamprefix}%{upstreamversion}
+%setup -q -n %{upstream_prefix}%{upstream_version}
%build
./autogen.sh
-%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no
+%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no --docdir=%{pcmk_docdir}
make %{_smp_mflags}
%install
@@ -144,8 +147,6 @@ rm -rf %{buildroot}
%files
###########################################################
%defattr(-,root,root)
-%dir %{_datadir}/doc/packages/pacemaker
-%dir %{_datadir}/doc/packages/pacemaker/templates
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
@@ -174,13 +175,15 @@ rm -rf %{buildroot}
%exclude %{_sbindir}/crm_uuid
%endif
-%doc %{_datadir}/doc/packages/pacemaker/AUTHORS
-%doc %{_datadir}/doc/packages/pacemaker/README
-%doc %{_datadir}/doc/packages/pacemaker/README.hb2openais
-%doc %{_datadir}/doc/packages/pacemaker/COPYING
-%doc %{_datadir}/doc/packages/pacemaker/COPYING.LGPL
-%doc %{_datadir}/doc/packages/pacemaker/crm_cli.txt
-%doc %{_datadir}/doc/packages/pacemaker/templates/*
+# Packaged elsewhere
+%exclude %{pcmk_docdir}/AUTHORS
+%exclude %{pcmk_docdir}/COPYING
+%exclude %{pcmk_docdir}/COPYING.LIB
+
+%exclude %{pcmk_docdir}/index.html
+%doc %{pcmk_docdir}/crm_cli.txt
+%doc %{pcmk_docdir}/crm_fencing.txt
+%doc %{pcmk_docdir}/README.hb2openais
%doc %{_mandir}/man8/*.8*
%doc COPYING
%doc AUTHORS
@@ -217,6 +220,24 @@ rm -rf %{buildroot}
%doc AUTHORS
%changelog
+* Thu Oct 29 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-4
+- Include the fixes from CoroSync integration testing
+- Move the resource templates - they're not documentation
+- Ensure documentation is placed in a standard location
+- Exclude documentation that is included elsewhere in the package
+
+- Update the tarball from upstream to version ee19d8e83c2a
+ + High: cib: Correctly clean up when both plaintext and tls remote ports are requested
+ + High: PE: Bug bnc#515172 - Provide better defaults for lt(e) and gt(e) comparisions
+ + High: PE: Bug lf#2197 - Allow master instances placemaker to be influenced by colocation constraints
+ + High: PE: Make sure promote/demote pseudo actions are created correctly
+ + High: PE: Prevent target-role from promoting more than master-max instances
+ + High: ais: Bug lf#2199 - Prevent expected-quorum-votes from being populated with garbage
+ + High: ais: Prevent deadlock - dont try to release IPC message if the connection failed
+ + High: cib: For validation errors, send back the full CIB so the client can display the errors
+ + High: cib: Prevent use-after-free for remote plaintext connections
+ + High: crmd: Bug lf#2201 - Prevent use-of-NULL when running heartbeat
+
* Wed Oct 13 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-3
- Update the tarball from upstream to version 38cd629e5c3c
+ High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 13 Oct 2009 11:53:31 -0000 1.5
+++ sources 29 Oct 2009 12:57:05 -0000 1.6
@@ -1 +1 @@
-4dc13c8478dee77a7abc8b06e6d8c716 38cd629e5c3c.tar.bz2
+277e12a5417ff294b166225f4d7c4648 ee19d8e83c2a.tar.bz2
More information about the fedora-extras-commits
mailing list