Update with 1.1.1 from upstream
This commit is contained in:
Andrew Beekhof
parent
8b5230e489
commit
d2ea9261d3
@ -1,2 +1 @@
|
|||||||
ee19d8e83c2a.tar.bz2
|
60b7753f7310.tar.bz2
|
||||||
66b7bfd467f3.patch
|
|
||||||
|
|||||||
@ -4,12 +4,12 @@
|
|||||||
%global with_heartbeat_support 1
|
%global with_heartbeat_support 1
|
||||||
%global pcmk_docdir %{_docdir}/%{name}
|
%global pcmk_docdir %{_docdir}/%{name}
|
||||||
|
|
||||||
%global specversion 5
|
%global specversion 1
|
||||||
%global upstream_version ee19d8e83c2a
|
%global upstream_version 60b7753f7310
|
||||||
%global upstream_prefix Pacemaker-1-0-
|
%global upstream_prefix Pacemaker-Devel-
|
||||||
|
|
||||||
# Keep around for when/if required
|
# Keep around for when/if required
|
||||||
#global alphatag %{upstream_version}.hg
|
%global alphatag %{upstream_version}.hg
|
||||||
|
|
||||||
%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
|
%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
|
||||||
|
|
||||||
@ -19,13 +19,12 @@
|
|||||||
|
|
||||||
Name: pacemaker
|
Name: pacemaker
|
||||||
Summary: Scalable High-Availability cluster resource manager
|
Summary: Scalable High-Availability cluster resource manager
|
||||||
Version: 1.0.5
|
Version: 1.1.1
|
||||||
Release: %{pcmk_release}
|
Release: %{pcmk_release}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Url: http://www.clusterlabs.org
|
Url: http://www.clusterlabs.org
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source0: http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
|
Source0: http://hg.clusterlabs.org/pacemaker/devel/archive/%{upstream_version}.tar.bz2
|
||||||
Patch1: 66b7bfd467f3.patch
|
|
||||||
|
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -107,7 +106,6 @@ resource health.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{upstream_prefix}%{upstream_version}
|
%setup -q -n %{upstream_prefix}%{upstream_version}
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
@ -120,9 +118,9 @@ make install DESTDIR=%{buildroot}
|
|||||||
|
|
||||||
# Scripts that need should be executable
|
# Scripts that need should be executable
|
||||||
chmod a+x %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py
|
chmod a+x %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py
|
||||||
chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/CTSlab.py
|
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
|
||||||
chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/OCFIPraTest.py
|
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/OCFIPraTest.py
|
||||||
chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/extracttests.py
|
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
|
||||||
|
|
||||||
# These are not actually scripts
|
# These are not actually scripts
|
||||||
find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
|
find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
|
||||||
@ -171,6 +169,9 @@ rm -rf %{buildroot}
|
|||||||
%{_sbindir}/crm_shadow
|
%{_sbindir}/crm_shadow
|
||||||
%{_sbindir}/cibpipe
|
%{_sbindir}/cibpipe
|
||||||
%{_sbindir}/crm_node
|
%{_sbindir}/crm_node
|
||||||
|
%{_sbindir}/crm_simulate
|
||||||
|
%{_sbindir}/fence_legacy
|
||||||
|
%{_sbindir}/stonith_admin
|
||||||
|
|
||||||
%if %with_heartbeat_support
|
%if %with_heartbeat_support
|
||||||
%{_sbindir}/crm_uuid
|
%{_sbindir}/crm_uuid
|
||||||
@ -183,7 +184,6 @@ rm -rf %{buildroot}
|
|||||||
%exclude %{pcmk_docdir}/COPYING
|
%exclude %{pcmk_docdir}/COPYING
|
||||||
%exclude %{pcmk_docdir}/COPYING.LIB
|
%exclude %{pcmk_docdir}/COPYING.LIB
|
||||||
|
|
||||||
%exclude %{pcmk_docdir}/index.html
|
|
||||||
%doc %{pcmk_docdir}/crm_cli.txt
|
%doc %{pcmk_docdir}/crm_cli.txt
|
||||||
%doc %{pcmk_docdir}/crm_fencing.txt
|
%doc %{pcmk_docdir}/crm_fencing.txt
|
||||||
%doc %{pcmk_docdir}/README.hb2openais
|
%doc %{pcmk_docdir}/README.hb2openais
|
||||||
@ -217,12 +217,15 @@ rm -rf %{buildroot}
|
|||||||
%files -n pacemaker-libs-devel
|
%files -n pacemaker-libs-devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_includedir}/pacemaker
|
%{_includedir}/pacemaker
|
||||||
%{_includedir}/heartbeat/fencing
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%doc COPYING.LIB
|
%doc COPYING.LIB
|
||||||
%doc AUTHORS
|
%doc AUTHORS
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 11 2010 Andrew Beekhof <andrew@beekhof.net> - 1.1.1-0.1-60b7753f7310.hg
|
||||||
|
- Update the tarball from upstream to version 60b7753f7310
|
||||||
|
+ First public release of the 1.1 series
|
||||||
|
|
||||||
* Wed Dec 9 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.5-5
|
* Wed Dec 9 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.5-5
|
||||||
- Include patch of changeset 66b7bfd467f3:
|
- Include patch of changeset 66b7bfd467f3:
|
||||||
Some clients such as gfs_controld want a cluster name, allow one to be specified in corosync.conf
|
Some clients such as gfs_controld want a cluster name, allow one to be specified in corosync.conf
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user