diff --git a/.gitignore b/.gitignore index e60daa8..c4eb20f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Pacemaker-1.1.4.tar.bz2 /Pacemaker-1.1.5.tar.bz2 +/Pacemaker-1.1.6.tar.bz2 diff --git a/pacemaker.spec b/pacemaker.spec index 1fbf6f1..4126015 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -9,7 +9,7 @@ # ESMTP is not available in RHEL, only in EPEL. Allow people to build # the RPM without ESMTP in case they choose not to use EPEL packages -%bcond_without esmtp +%bcond_with esmtp # SNMP trap support only works with Net-SNMP 5.4 and above # And links against libperl.so which is borked on fedora @@ -18,17 +18,23 @@ # Support additional trace logging %bcond_with tracedata +%bcond_without doc + # We generate some docs using Publican, but its not available everywhere %bcond_with publican -%global specversion 3 -%global upstream_version Pacemaker-1.1.5 +%global specversion 1 +%global upstream_version Pacemaker-1.1.6 %global upstream_prefix Pacemaker-1-1- -# Keep around for when/if required -#global alphatag %{upstream_version}.hg +# Use a different versioning scheme +%bcond_with pre_release -%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist} +%if %{with pre_release} +%global pcmk_release 0.%{specversion}.%{upstream_version}.hg +%else +%global pcmk_release %{specversion} +%endif # Compatibility macros for distros that don't provide Python macros by default. # Do this instead of trying to conditionally include @@ -40,24 +46,23 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager -Version: 1.1.5 -Release: %{pcmk_release}.2 +Version: 1.1.6 +Release: %{pcmk_release}%{?dist} License: GPLv2+ and LGPLv2+ Url: http://www.clusterlabs.org Group: System Environment/Daemons Source0: http://hg.clusterlabs.org/pacemaker/1.1/archive/%{upstream_version}.tar.bz2 -Patch3: cman-fencing-ack.patch -Patch4: cman-dispatch-all.patch -Patch5: cman-disconnect.patch -Patch6: cman-fencing-override.patch -Patch7: pacemaker-multilib-header.patch -Patch8: stonith-manpage.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: on Requires(pre): cluster-glue Requires: resource-agents +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-cli = %{version}-%{release} + +%if %{with snmp} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif # Required for core functionality BuildRequires: automake autoconf libtool pkgconfig libtool-ltdl-devel python-devel @@ -88,9 +93,13 @@ BuildRequires: clusterlib-devel BuildRequires: heartbeat-devel heartbeat-libs %endif +%if %{with doc} +BuildRequires: asciidoc help2man + %if %{with publican} %ifarch %{ix86} x86_64 -BuildRequires: publican +BuildRequires: publican inkscape +%endif %endif %endif @@ -105,13 +114,13 @@ It will run scripts at initialization, when machines go up or down, when related resources fail and can be configured to periodically check resource health. -%package -n pacemaker-libs +%package cli License: GPLv2+ and LGPLv2+ -Summary: Libraries used by the Pacemaker cluster resource manager and its clients +Summary: Command line tools for controlling the Pacemaker cluster resource manager Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} -%description -n pacemaker-libs +%description cli Pacemaker is an advanced, scalable High-Availability cluster resource manager for Linux-HA (Heartbeat) and/or OpenAIS. @@ -122,7 +131,23 @@ It will run scripts at initialization, when machines go up or down, when related resources fail and can be configured to periodically check resource health. -%package -n pacemaker-libs-devel +%package -n %{name}-libs +License: GPLv2+ and LGPLv2+ +Summary: Libraries used by the Pacemaker cluster resource manager and its clients +Group: System Environment/Daemons + +%description -n %{name}-libs +Pacemaker is an advanced, scalable High-Availability cluster resource +manager for Linux-HA (Heartbeat) and/or OpenAIS. + +It supports "n-node" clusters with significant capabilities for +managing resources and dependencies. + +It will run scripts at initialization, when machines go up or down, +when related resources fail and can be configured to periodically check +resource health. + +%package -n %{name}-libs-devel License: GPLv2+ and LGPLv2+ Summary: Pacemaker development package Group: Development/Libraries @@ -135,7 +160,7 @@ Requires: corosynclib-devel Requires: heartbeat-devel %endif -%description -n pacemaker-libs-devel +%description -n %{name}-libs-devel Headers and shared libraries for developing tools for Pacemaker. Pacemaker is an advanced, scalable High-Availability cluster resource @@ -177,16 +202,14 @@ resource health. %prep %setup -q -n %{upstream_prefix}%{upstream_version} -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build ./autogen.sh +%if %{with snmp} +eval `objdump --headers --private-headers /usr/bin/perl | grep RPATH | awk '{print "export LD_LIBRARY_PATH="$2}'` +%endif + %{configure} \ %{!?with_heartbeat: --without-heartbeat} \ %{!?with_ais: --without-ais} \ @@ -244,9 +267,9 @@ if [ $1 -eq 0 ]; then /sbin/chkconfig --del pacemaker || : fi -%post -n pacemaker-libs -p /sbin/ldconfig +%post -n %{name}-libs -p /sbin/ldconfig -%postun -n pacemaker-libs -p /sbin/ldconfig +%postun -n %{name}-libs -p /sbin/ldconfig %files ########################################################### @@ -257,39 +280,18 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pacemaker %{_initddir}/pacemaker %{_sbindir}/pacemakerd +%if %{defined _unitdir} +%{_unitdir}/pacemaker.service +%endif %{_datadir}/pacemaker %{_datadir}/snmp/mibs/PCMK-MIB.txt %{_libdir}/heartbeat/* -%{_sbindir}/cibadmin %{_sbindir}/crm_attribute -%{_sbindir}/crm_diff -%{_sbindir}/crm_failcount %{_sbindir}/crm_master -%{_sbindir}/crm_mon -%{_sbindir}/crm -%{_sbindir}/crm_simulate -%{_sbindir}/crm_resource -%{_sbindir}/crm_report -%{_sbindir}/crm_standby -%{_sbindir}/crm_verify -%{_sbindir}/crmadmin -%{_sbindir}/iso8601 %{_sbindir}/attrd_updater -%{_sbindir}/ptest -%{_sbindir}/crm_shadow -%{_sbindir}/cibpipe -%{_sbindir}/crm_node %{_sbindir}/fence_legacy %{_sbindir}/stonith_admin -%{py_sitedir}/crm -%{_mandir} - -%if %{with heartbeat} -%{_sbindir}/crm_uuid -%else -%exclude %{_sbindir}/crm_uuid -%endif # Packaged elsewhere %exclude %{_datadir}/pacemaker/tests @@ -308,7 +310,42 @@ fi %{_libexecdir}/lcrso/pacemaker.lcrso %endif -%files -n pacemaker-libs +%files cli +%defattr(-,root,root) +%{_sbindir}/cibadmin +%{_sbindir}/crm_diff +%{_sbindir}/crm_failcount +%{_sbindir}/crm_mon +%{_sbindir}/crm +%{_sbindir}/crm_resource +%{_sbindir}/crm_standby +%{_sbindir}/crm_verify +%{_sbindir}/crmadmin +%{_sbindir}/iso8601 +%{_sbindir}/ptest +%{_sbindir}/crm_shadow +%{_sbindir}/cibpipe +%{_sbindir}/crm_node +%{_sbindir}/crm_simulate +%{_sbindir}/crm_report +%{_sbindir}/crm_ticket +%{py_sitedir}/crm +%if %{with doc} +%doc %{_mandir}/man7/* +%doc %{_mandir}/man8/* +%endif + +%if %{with heartbeat} +%{_sbindir}/crm_uuid +%else +%exclude %{_sbindir}/crm_uuid +%endif + +%doc COPYING +%doc AUTHORS +%doc ChangeLog + +%files -n %{name}-libs %defattr(-,root,root) %{_libdir}/libcib.so.* %{_libdir}/libcrmcommon.so.* @@ -332,16 +369,24 @@ fi %doc COPYING.LIB %doc AUTHORS -%files -n pacemaker-libs-devel +%files -n %{name}-libs-devel %defattr(-,root,root) %exclude %{_datadir}/pacemaker/tests/cts %{_datadir}/pacemaker/tests %{_includedir}/pacemaker %{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc %doc COPYING.LIB %doc AUTHORS %changelog +* Thu Sep 07 2011 Andrew Beekhof 1.1.6-1 +- Upstream release of 1.1.6 +- See included ChangeLog file or http://hg.clusterlabs.org/pacemaker/1.1/file/tip/ChangeLog for details + +- Disabled eSMTP and SNMP support. Painful to configure and rarely used. +- Created cli sub-package for non-cluster usage + * Thu Jul 21 2011 Petr Sabata - 1.1.5-3.2 - Perl mass rebuild diff --git a/sources b/sources index 559c69b..044e20e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -131c5fbf0adf3e34324198f139f2e8ea Pacemaker-1.1.5.tar.bz2 +70a3605231977c3df0f25439d0d5551e Pacemaker-1.1.6.tar.bz2