rpms/pacemaker/devel pacemaker.spec,1.3,1.4
Andrew Beekhof
beekhof at fedoraproject.org
Wed Aug 19 08:25:30 UTC 2009
Author: beekhof
Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362
Modified Files:
pacemaker.spec
Log Message:
Add heartbeat support
Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pacemaker.spec 17 Aug 2009 19:14:09 -0000 1.3
+++ pacemaker.spec 19 Aug 2009 08:25:30 -0000 1.4
@@ -1,13 +1,13 @@
%global gname haclient
%global uname hacluster
%global with_ais_support 1
-%global with_heartbeat_support 0
+%global with_heartbeat_support 1
# Enable heartbeat support once it builds against cluster-glue
# 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 1
+%global specversion 2
%global upstreamprefix Pacemaker-1-0-
%global upstreamversion 462f1569a437
@@ -26,9 +26,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
AutoReqProv: on
Requires(pre): cluster-glue
Requires: resource-agents
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# Required for core functionality
-BuildRequires: automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
+BuildRequires: automake autoconf libtool pkgconfig libtool-ltdl-devel
BuildRequires: glib2-devel cluster-glue-libs-devel libxml2-devel libxslt-devel
BuildRequires: pkgconfig python-devel gcc-c++ bzip2-devel gnutls-devel pam-devel
@@ -41,8 +42,8 @@ BuildRequires: corosynclib-devel
Requires: corosync
%endif
%if %with_heartbeat_support
-BuildRequires: heartbeat-devel
-Requires: heartbeat
+BuildRequires: heartbeat-devel heartbeat-libs
+Requires: heartbeat >= 3.0.0
%endif
%description
@@ -79,6 +80,12 @@ Summary: Pacemaker development package
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: cluster-glue-libs-devel
+%if %with_ais_support
+Requires: corosynclib-devel
+%endif
+%if %with_heartbeat_support
+Requires: heartbeat-devel
+%endif
%description -n pacemaker-libs-devel
Headers and shared libraries for developing tools for Pacemaker.
@@ -111,9 +118,6 @@ chmod a+x %{buildroot}/%{_datadir}/pacem
chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/OCFIPraTest.py
chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/extracttests.py
-# Remove RPATH information
-find %{buildroot} -type f -exec chrpath -d {} >/dev/null 2>&1 \;
-
# These are not actually scripts
find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -name '*.xsl' -type f -print0 | xargs -0 chmod a-x
@@ -212,6 +216,15 @@ rm -rf %{buildroot}
%doc AUTHORS
%changelog
+* Wed Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-2
+- Add versioned perl dependancy as specified by
+ https://fedoraproject.org/wiki/Packaging/Perl#Packages_that_link_to_libperl
+- No longer remove RPATH data, it prevents us finding libperl.so and no other
+ libraries were being hardcoded
+- Compile in support for heartbeat
+- Conditionally add heartbeat-devel and corosynclib-devel to the -devel requirements
+ depending on which stacks are supported
+
* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-1
- Add dependancy on resource-agents
- Use the version of the configure macro that supplies --prefix, --libdir, etc
More information about the fedora-extras-commits
mailing list