Packaging update for RHEL-6

resource-agents.spec

@@ -22,7 +22,7 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.12
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -60,13 +60,18 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
-BuildRequires: python perl libnet-devel
+BuildRequires: python perl 
+
+%if 0%{?rhel} == 0
+BuildRequires: libnet-devel
+%endif
 
 %description
 A set of scripts to interface with several services to operate in a
 High Availability environment for both Pacemaker and rgmanager
 service managers.
 
+%if 0%{?rhel} == 0
 %package -n ldirectord
 Summary:          Monitor daemon for maintaining high availability resources
 Group:            System Environment/Daemons
@@ -90,6 +95,7 @@ ldirectord is a stand-alone daemon to monitor services of real
 for virtual services provided by The Linux Virtual Server
 (http://www.linuxvirtualserver.org/). It is simple to install 
 and works with the heartbeat code (http://www.linux-ha.org/).
+%endif
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -136,6 +142,12 @@ rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
 rm -rf %{buildroot}%{_datadir}/resource-agents/ocft
 rm -f  %{buildroot}%{_sbindir}/ocft
 
+%if 0%{?rhel} != 0
+# ldirectord isn't included on RHEL
+find %{buildroot} -name 'ldirectord.*' -exec rm -f {} \;
+find %{buildroot} -name 'ldirectord' -exec rm -f {} \;
+%endif
+
 # symlink to allow pacemaker to use rgmanager RAs
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
@@ -143,6 +155,7 @@ cd %{buildroot}/usr/lib/ocf/resource.d/ && \
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?rhel} == 0
 %post -n ldirectord
 /sbin/chkconfig --add ldirectord
 
@@ -150,6 +163,7 @@ rm -rf %{buildroot}
 
 %preun -n ldirectord
 /sbin/chkconfig --del ldirectord
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -177,6 +191,7 @@ rm -rf %{buildroot}
 %{_libdir}/heartbeat/sfex_daemon
 %{_includedir}/heartbeat/agent_config.h
 
+%if 0%{?rhel} == 0
 %files -n ldirectord
 %defattr(-,root,root,-)
 %doc %{altprefix}%{altversion}/COPYING 
@@ -187,8 +202,14 @@ rm -rf %{buildroot}
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_mandir}/man8/ldirectord.8*
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
+%endif
 
 %changelog
+* Tue May 18 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-2
+- libnet is not available on RHEL
+- Do not package ldirectord on RHEL
+  Resolves: rhbz#577264
+
 * Mon May 10 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.12-1
 - new upstream release
   Resolves: rhbz#585217, rhbz#586100, rhbz#581533, rhbz#582753