From 7370eda4fe19b3c8b0cf95d0dcb85aaef84fc03e Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 24 Feb 2021 10:25:38 +0100 Subject: [PATCH] - remove ldirectord subpackage Resolves: rhbz#1932218 --- resource-agents.spec | 110 ++++++------------------------------------- 1 file changed, 14 insertions(+), 96 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 8757aff..cce281d 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -38,13 +38,6 @@ } || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \ } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?)) -# SSLeay (required by ldirectord) -%if 0%{?suse_version} -%global SSLeay perl-Net_SSLeay -%else -%global SSLeay perl-Net-SSLeay -%endif - # determine the ras-set to process based on configure invokation %bcond_with rgmanager %bcond_without linuxha @@ -52,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.7.0 -Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -64,7 +57,6 @@ Provides: heartbeat-resources = %{version} # Build dependencies BuildRequires: make BuildRequires: automake autoconf pkgconfig gcc -BuildRequires: perl BuildRequires: libxslt glib2-devel BuildRequires: systemd BuildRequires: which @@ -139,42 +131,6 @@ A set of scripts to interface with several services to operate in a High Availability environment for both Pacemaker and rgmanager service managers. -%if %{with linuxha} -%package -n ldirectord -License: GPLv2+ -Summary: A Monitoring Daemon for Maintaining High Availability Resources -%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} -%else -%endif -Obsoletes: heartbeat-ldirectord <= %{version} -Provides: heartbeat-ldirectord = %{version} -%if 0%{?fedora} > 18 || 0%{?centos} > 6 || 0%{?rhel} > 6 -BuildRequires: perl-podlators -%endif -Requires: %{SSLeay} perl-libwww-perl perl-MailTools -Requires: ipvsadm logrotate -%if 0%{?fedora} -Requires: perl-Net-IMAP-Simple-SSL perl-IO-Socket-INET6 -Requires(post): /sbin/chkconfig -Requires(preun):/sbin/chkconfig -%endif -%if %{systemd_native} -BuildRequires: systemd -%endif -%{?systemd_requires} - -%description -n ldirectord -The Linux Director Daemon (ldirectord) was written by Jacob Rief. - - -ldirectord is a stand alone daemon for monitoring the services on real -servers. Currently, HTTP, HTTPS, and FTP services are supported. -ldirectord is simple to install and works with Pacemaker -(http://clusterlabs.org/). - -See 'ldirectord -h' and linux-ha/doc/ldirectord for more information. -%endif - %prep %if 0%{?suse_version} == 0 && 0%{?fedora} == 0 && 0%{?centos} == 0 && 0%{?rhel} == 0 %{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.} @@ -322,64 +278,26 @@ test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin %{_libexecdir}/heartbeat +%exclude %{_sbindir}/ldirectord +%exclude %{_mandir}/man8/ldirectord.8* +%exclude %{_sysconfdir}/ha.d/resource.d +%exclude %{_sysconfdir}/init.d/ldirectord +%exclude %{_sysconfdir}/rc.d/init.d/ldirectord +%exclude %{_sysconfdir}/logrotate.d/ldirectord +%exclude %{_unitdir}/ldirectord.service + %if %{with rgmanager} %post -n resource-agents ccs_update_schema > /dev/null 2>&1 ||: %endif - -%if 0%{?suse_version} -%preun -n ldirectord -%stop_on_removal ldirectord -%postun -n ldirectord -%insserv_cleanup -%endif - -%if 0%{?fedora} -%preun -n ldirectord -%if %{defined _unitdir} -%systemd_preun ldirectord.service -%else -/sbin/chkconfig --del ldirectord -%endif -%postun -n ldirectord -/sbin/ldconfig -%if %{defined _unitdir} -%systemd_postun_with_restart ldirectord.service -%endif -%post -n ldirectord -%if %{defined _unitdir} -%systemd_post ldirectord.service -%else -/sbin/chkconfig --add ldirectord -%endif -%endif -%endif - -%if %{with linuxha} -%files -n ldirectord -%{_sbindir}/ldirectord -%doc ldirectord/ldirectord.cf COPYING -%{_mandir}/man8/ldirectord.8* -%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord -%dir %{_sysconfdir}/ha.d -%dir %{_sysconfdir}/ha.d/resource.d -%{_sysconfdir}/ha.d/resource.d/ldirectord -%if %{defined _unitdir} -%{_unitdir}/ldirectord.service -%exclude %{_sysconfdir}/init.d/ldirectord -%exclude %{_sysconfdir}/rc.d/init.d/ldirectord -%else -%{_sysconfdir}/init.d/ldirectord -%endif -%if 0%{?suse_version} -/sbin/rcldirectord -%endif -%if 0%{?fedora} -%{_usr}/lib/ocf/resource.d/heartbeat/ldirectord -%endif %endif %changelog +* Wed Feb 24 2021 Oyvind Albrigtsen - 4.7.0-4 +- remove ldirectord subpackage + + Resolves: rhbz#1932218 + * Tue Feb 16 2021 Oyvind Albrigtsen - 4.7.0-3 - add BuildRequires for google lib - use HA cloud support supplied awscli