!3 disable python2

From: @jackie_wu123
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-10-30 10:49:00 +08:00 committed by Gitee
commit 98707927c1

View File

@ -1,17 +1,16 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.2.0 Version: 4.2.0
Release: 2 Release: 3
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: https://github.com/ClusterLabs/resource-agents/archive/v4.2.0.tar.gz Source0: https://github.com/ClusterLabs/resource-agents/archive/v4.2.0.tar.gz
Obsoletes: heartbeat-resources <= %{version} Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version} Provides: heartbeat-resources = %{version}
BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python2-devel BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel
BuildRequires: libxslt glib2-devel which docbook-style-xsl docbook-dtds BuildRequires: libxslt glib2-devel which docbook-style-xsl docbook-dtds
Requires: bash grep sed gawk procps-ng hostname net-tools psmisc util-linux Requires: bash grep sed gawk procps-ng hostname net-tools psmisc util-linux
Requires: e2fsprogs xfsprogs nfs-utils cifs-utils iproute lvm2 Requires: e2fsprogs xfsprogs nfs-utils cifs-utils iproute lvm2
%description %description
Resource agent is a standardized interface for a cluster resource. In translates a standard set of operations into Resource agent is a standardized interface for a cluster resource. In translates a standard set of operations into
steps specific to the resource or application, and interprets their results as success or failure. steps specific to the resource or application, and interprets their results as success or failure.
@ -22,11 +21,9 @@ Summary: Monitoring Daemon for Maintaining High Availability Resources
Obsoletes: heartbeat-ldirectord <= %{version} Obsoletes: heartbeat-ldirectord <= %{version}
Provides: heartbeat-ldirectord = %{version} Provides: heartbeat-ldirectord = %{version}
BuildRequires: perl-podlators BuildRequires: perl-podlators
Requires: perl-Net-SSLeay perl-libwww-perl perl-MailTools Requires: perl-Net-SSLeay perl-libwww-perl perl-MailTools ipvsadm logrotate
Requires: ipvsadm logrotate
BuildRequires: systemd BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
%description -n ldirectord %description -n ldirectord
Ldirectord is a daemon to monitor and administer real servers in a cluster of load Ldirectord is a daemon to monitor and administer real servers in a cluster of load
balanced virtual servers.Currently, HTTP, HTTPS, and FTP services are supported. balanced virtual servers.Currently, HTTP, HTTPS, and FTP services are supported.
@ -34,7 +31,6 @@ ldirectord typically is started from heartbeat but can also be run from the comm
%package help %package help
Summary: Help documentation for resource-agents Summary: Help documentation for resource-agents
%description help %description help
Help documentation for resource-agents. Help documentation for resource-agents.
@ -45,10 +41,8 @@ Help documentation for resource-agents.
if [ ! -f configure ]; then if [ ! -f configure ]; then
./autogen.sh ./autogen.sh
fi fi
export CFLAGS="$(echo '%{optflags}')" export CFLAGS="$(echo '%{optflags}')"
%global conf_opt_fatal "--enable-fatal-warnings=no" %global conf_opt_fatal "--enable-fatal-warnings=no"
%configure \ %configure \
%{conf_opt_fatal} --with-systemdsystemunitdir=%{_unitdir} --with-systemdtmpfilesdir=%{_tmpfilesdir} \ %{conf_opt_fatal} --with-systemdsystemunitdir=%{_unitdir} --with-systemdtmpfilesdir=%{_tmpfilesdir} \
--with-pkg-name=%{name} --with-ras-set=linux-ha --with-pkg-name=%{name} --with-ras-set=linux-ha
@ -74,7 +68,6 @@ export CFLAGS="$(echo '%{optflags}')"
%{_sbindir}/ocf-tester %{_sbindir}/ocf-tester
%{_sbindir}/ocft %{_sbindir}/ocft
%{_includedir}/heartbeat %{_includedir}/heartbeat
%dir %attr (1755, root, root) %{_var}/run/resource-agents %dir %attr (1755, root, root) %{_var}/run/resource-agents
%dir %{_sysconfdir}/ha.d %dir %{_sysconfdir}/ha.d
%{_sysconfdir}/ha.d/shellfuncs %{_sysconfdir}/ha.d/shellfuncs
@ -82,9 +75,11 @@ export CFLAGS="$(echo '%{optflags}')"
%preun -n ldirectord %preun -n ldirectord
%systemd_preun ldirectord.service %systemd_preun ldirectord.service
%postun -n ldirectord %postun -n ldirectord
/sbin/ldconfig /sbin/ldconfig
%systemd_postun_with_restart ldirectord.service %systemd_postun_with_restart ldirectord.service
%post -n ldirectord %post -n ldirectord
%systemd_post ldirectord.service %systemd_post ldirectord.service
@ -105,5 +100,8 @@ export CFLAGS="$(echo '%{optflags}')"
%{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*}
%changelog %changelog
* Tue Oct 27 2020 Anan Fu <fuanan3@huawei.com> - 4.2.0-3
- disable python2
* Thu Mar 5 2020 shijian <shijian16@huawei.com> - 4.2.0-2 * Thu Mar 5 2020 shijian <shijian16@huawei.com> - 4.2.0-2
- Package init - Package init