Python 2 is EOL since Jan 2020, but we kept the option to build for
python2. Remove this option so we can remove the python 2 hacks from the
sanlock C extension module.
Users that want python 2 support should use sanlock <= 3.8.2.
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
python/Makefile | 2 +-
sanlock.spec.in | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/python/Makefile b/python/Makefile
index 2caf6a8..9fd2691 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -4,7 +4,7 @@
# modify, copy, or redistribute it subject to the terms and conditions
# of the GNU General Public License v.2.
-PYTHON := python$(PY_VERSION)
+PYTHON := python3
all:
$(PYTHON) setup.py build $(BUILDARGS)
diff --git a/sanlock.spec.in b/sanlock.spec.in
index b14da9b..975bd4e 100644
--- a/sanlock.spec.in
+++ b/sanlock.spec.in
@@ -46,7 +46,7 @@ The sanlock daemon manages leases for applications on hosts using shared
storage
# upstream does not support _smp_mflags
CFLAGS=$RPM_OPT_FLAGS make -C wdmd
CFLAGS=$RPM_OPT_FLAGS make -C src
-CFLAGS=$RPM_OPT_FLAGS make -C python PY_VERSION=3
+CFLAGS=$RPM_OPT_FLAGS make -C python
CFLAGS=$RPM_OPT_FLAGS make -C reset
%install
@@ -59,8 +59,7 @@ make -C wdmd \
DESTDIR=$RPM_BUILD_ROOT
make -C python \
install LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT \
- PY_VERSION=3
+ DESTDIR=$RPM_BUILD_ROOT
make -C reset \
install LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
--
2.26.2