From 2bfa2d44dcfde68126e02bbe17a4b21168a63a69be6b9d77bfca5eba3382422e Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 1 Dec 2022 07:26:00 +0000 Subject: [PATCH] Accepting request 1039211 from home:StevenK:branches:network:cluster - Actually move Python plugin to building with Python 3, and rename the Python binding package to reflect this. - Add patch also-check-for-python3.patch to check for Python 3 as well. OBS-URL: https://build.opensuse.org/request/show/1039211 OBS-URL: https://build.opensuse.org/package/show/network:cluster/genders?expand=0&rev=28 --- also-check-for-python3.patch | 13 +++++++++++++ genders.changes | 7 +++++++ genders.spec | 14 +++++++------- 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 also-check-for-python3.patch diff --git a/also-check-for-python3.patch b/also-check-for-python3.patch new file mode 100644 index 0000000..e60d7db --- /dev/null +++ b/also-check-for-python3.patch @@ -0,0 +1,13 @@ +Index: genders-1.27.3/configure.ac +=================================================================== +--- genders-1.27.3.orig/configure.ac ++++ genders-1.27.3/configure.ac +@@ -80,7 +80,7 @@ AM_PROG_LEX + AC_PROG_YACC + AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes") + AC_PATH_PROG([PERL], [perl]) +-AC_PATH_PROG([PYTHON], [python]) ++AC_PATH_PROG([PYTHON], [python], [python3]) + AC_PATH_PROG([POD2MAN], [pod2man], [/usr/bin/pod2man], [$PATH:/usr/perl5/bin/]) + AC_PATH_PROG([JAVAC], [javac]) + AC_PATH_PROG([JAVAH], [javah]) diff --git a/genders.changes b/genders.changes index a84ebab..fa8025c 100644 --- a/genders.changes +++ b/genders.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 1 02:13:43 UTC 2022 - Steve Kowalik + +- Actually move Python plugin to building with Python 3, and rename the + Python binding package to reflect this. +- Add patch also-check-for-python3.patch to check for Python 3 as well. + ------------------------------------------------------------------- Mon Jul 25 12:25:49 UTC 2022 - Christian Goll diff --git a/genders.spec b/genders.spec index 0c29558..49c72b8 100644 --- a/genders.spec +++ b/genders.spec @@ -31,6 +31,7 @@ Source: https://github.com/chaos/genders/archive/genders-%{slash_ver}/%{ Patch1: Fix-Python-package-installation-use-root.patch Patch2: Remove-PERL_DESTDIR-use-DESTDIR-instead.patch Patch4: lua_bindings.patch +Patch5: also-check-for-python3.patch URL: https://github.com/chaos/genders BuildRequires: autoconf BuildRequires: autoconf-archive @@ -41,9 +42,6 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: lua-devel BuildRequires: patchelf -BuildRequires: python -BuildRequires: python-devel -BuildRequires: python3 BuildRequires: python3-devel BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{name}-base @@ -80,13 +78,14 @@ Requires: %{name} = %{version} %description devel genders headers and libraries files needed for development -%package -n python-%{name} +%package -n python3-%{name} Summary: Python bindings for genders Group: Development/Languages/Python +Provides: python-%{name} = %{version} +Obsoletes: python-%{name} Requires: %{name} = %{version} -Requires: python -%description -n python-%{name} +%description -n python3-%{name} Necessary files for using genders with Python. %package -n lua-%{name} @@ -146,6 +145,7 @@ rm -r genders-genders-%{slash_ver} %autopatch -p1 %build +export PYTHON=python3 aclocal --force --install -I config libtoolize -f -i automake -a -f @@ -247,7 +247,7 @@ chmod 444 $brklib %{_mandir}/man3/libgenders* %if %{?_with_python_extensions:1}%{!?_with_python_extensions:0} -%files -n python-%{name} +%files -n python3-%{name} %{_libdir}/python* %endif