- build with python3

diff --git a/heartbeat-ac.patch b/heartbeat-ac.patch
index c6fae9500cab6e87da6bab2fb5b9ff8fba7d33f0..f0052259d38c1082eaf2b9bd42dc5c7cdbeec51e 100644 (file)
--- a/heartbeat-ac.patch
+++ b/heartbeat-ac.patch
@@ -1,6 +1,7 @@
---- heartbeat-3.0.6/configure.ac.orig  Tue Feb 17 06:50:30 2004
-+++ heartbeat-3.0.6/configure.ac       Tue Mar 16 13:36:09 2004
-@@ -258,18 +258,7 @@
+diff -urNp -x '*.orig' Heartbeat-3-0-STABLE-3.0.6.org/configure.ac Heartbeat-3-0-STABLE-3.0.6/configure.ac
+--- Heartbeat-3-0-STABLE-3.0.6.org/configure.ac        2015-02-04 15:57:04.000000000 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/configure.ac    2024-04-25 23:59:40.319018426 +0200
+@@ -777,18 +777,7 @@ fi
  dnl Determine if we use -w1 or -t1 for ping (in PYTHON Scripts)
  
  
@@ -19,8 +20,8 @@
 +PING_TIMEOUT_OPT="-w1"
  AC_SUBST(PING_TIMEOUT_OPT)
  
- dnl Determining a route (particularly for "findif").
-@@ -816,17 +816,7 @@
+ 
+@@ -806,17 +795,7 @@ AC_DEFINE(PROCROUTE, "/proc/net/route",
  
  
  AC_MSG_CHECKING(ifconfig option to list interfaces)
@@ -39,9 +40,7 @@
  
  AC_SUBST(IFCONFIG_A_OPT)
  AC_SUBST(WHOAMI)
---- heartbeat-3.0.6/configure.ac.orig  2006-08-08 14:41:54.000000000 +0200
-+++ heartbeat-3.0.6/configure.ac       2007-01-27 19:23:30.919741000 +0100
-@@ -1693,8 +1693,12 @@ dnl ************ printw ****************
+@@ -1585,8 +1564,12 @@ dnl ************ printw ****************
              [
  #if defined(HAVE_CURSES_H)
  #  include <curses.h>

diff --git a/heartbeat.spec b/heartbeat.spec
index cf1ea778fc75b7a2bcbc54d86fc2aef1f8247147..df67021eee32580aa8a20ac18ee531f445925663 100644 (file)
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      Podsystem heartbeat dla systemów o podwyższonej niezawodno
 Summary(pt_BR.UTF-8):  Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade
 Name:          heartbeat
 Version:       3.0.6
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-%{version}.tar.bz2
@@ -36,8 +36,8 @@ BuildRequires:        libuuid-devel
 BuildRequires: libxslt-progs
 BuildRequires: ncurses-devel >= 5.4
 BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-devel
+BuildRequires: python3
+BuildRequires: python3-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
@@ -136,7 +136,7 @@ Zestaw testów klastra opartego o heartbeat.
 %patch3 -p1
 
 %{__sed} -i -e '1{
-       s,^#!.*python$,#!%{__python},
+       s,^#!.*python$,#!%{__python3},
 }' \
        heartbeat/{hb_api,ha_test}.py
 
@@ -147,7 +147,7 @@ Zestaw testów klastra opartego o heartbeat.
 %{__autoheader}
 %{__automake}
 %configure \
-       PYTHON=%{__python} \
+       PYTHON=%{__python3} \
        --with-initdir=/etc/rc.d/init.d \
        --with-systemdunitdir=%{systemdunitdir} \
        --docdir=%{_docdir}/%{name}-%{version} \
@@ -313,6 +313,6 @@ fi
 %doc cts/README
 %dir %{_datadir}/heartbeat/cts
 %attr(755,root,root) %{_datadir}/heartbeat/cts/*.py
-%{_datadir}/heartbeat/cts/*.py[co]
+%{_datadir}/heartbeat/cts/__pycache__/*.py[co]
 %attr(755,root,root) %{_datadir}/heartbeat/cts/*.sh
 %attr(755,root,root) %{_datadir}/heartbeat/cts/*Dummy