[packages/vde2] - switch to python3
hawk
hawk at pld-linux.org
Mon Jul 24 03:23:27 CEST 2023
commit d32f71a6492ea82ac8a817eeb698e1e884342697
Author: Marcin Krol <hawk at tld-linux.org>
Date: Mon Jul 24 01:31:46 2023 +0200
- switch to python3
python3.patch | 21 +++++++++++++++++++++
vde2.spec | 22 ++++++++++++----------
2 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/vde2.spec b/vde2.spec
index fdeb7f8..a17e3e4 100644
--- a/vde2.spec
+++ b/vde2.spec
@@ -2,7 +2,7 @@ Summary: VDE2: Virtual Distributed Ethernet
Summary(pl.UTF-8): VDE2: wirtualny rozproszony ethernet
Name: vde2
Version: 2.3.2
-Release: 6
+Release: 7
License: LGPL v2.1+ (libvdeplug), BSD (slirpvde), GPL v2+ (the rest)
Group: Networking/Utilities
Source0: http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
@@ -10,13 +10,14 @@ Source0: http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
Patch0: %{name}-pathmax.patch
Patch1: %{name}-format.patch
Patch2: %{name}-openssl-1.1.patch
+Patch3: python3.patch
URL: http://sourceforge.net/projects/vde/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: libpcap-devel
BuildRequires: libtool
BuildRequires: openssl-devel
-BuildRequires: python-devel >= 1:2.5
+BuildRequires: python3-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
Requires: %{name}-libs = %{version}-%{release}
@@ -89,6 +90,7 @@ Pythonowy interfejs do VDE2.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -101,26 +103,25 @@ Pythonowy interfejs do VDE2.
--enable-kernel-switch
%{__make} -j1 \
- pythondir=%{py_sitedir}
+ pythondir=%{py3_sitedir}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py_sitedir}
+ pythondir=%{py3_sitedir}
# loadable modules
%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/libvdetap.{la,a}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/vde_l3/*.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/vdeplug_python.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/vdeplug_python.la
# libs .la kept - no Requires/Libs.private
cp -p src/slirpvde/README README.slirpvde
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -226,5 +227,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n python-vde2
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/vdeplug_python.so
-%{py_sitedir}/VdePlug.py[co]
+%attr(755,root,root) %{py3_sitedir}/vdeplug_python.so
+%{py3_sitedir}/VdePlug.py
+%{py3_sitedir}/__pycache__/VdePlug.cpython-*.py[co]
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..31718bc
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,21 @@
+diff -ur vde2-2.3.2.orig/configure.ac vde2-2.3.2/configure.ac
+--- vde2-2.3.2.orig/configure.ac 2011-11-23 17:41:19.000000000 +0100
++++ vde2-2.3.2/configure.ac 2023-07-23 23:25:48.994431962 +0200
+@@ -192,7 +192,7 @@
+
+ if test x"$enable_python" = x"yes"; then
+ # check python
+- AM_PATH_PYTHON([2.5])
++ AM_PATH_PYTHON([3])
+ AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
+ if test x"$PYTHON_CONFIG" = x""; then
+ AC_PATH_PROG(PYTHON_CONFIG, python-config)
+diff -ur vde2-2.3.2.orig/src/lib/python/VdePlug.py vde2-2.3.2/src/lib/python/VdePlug.py
+--- vde2-2.3.2.orig/src/lib/python/VdePlug.py 2011-11-23 17:41:17.000000000 +0100
++++ vde2-2.3.2/src/lib/python/VdePlug.py 2023-07-23 23:38:52.517525533 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+ '''
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vde2.git/commitdiff/d32f71a6492ea82ac8a817eeb698e1e884342697
More information about the pld-cvs-commit
mailing list