From 2dd7fe4b0d576d55829bcb6c1088095b35bb91746b895c15d3d2a8d98a7a9e4b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Jan 2021 08:34:30 +0000 Subject: [PATCH] Accepting request 865075 from home:Monex:Database The build for openSUSE factory fails at the moment, because of different python3 flavors. The spec file was updated to handle the case of different flavors so that the build succeeds. OBS-URL: https://build.opensuse.org/request/show/865075 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyodbc?expand=0&rev=21 --- python-pyodbc.changes | 6 ++++++ python-pyodbc.spec | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/python-pyodbc.changes b/python-pyodbc.changes index bcb8374..a7a0cec 100644 --- a/python-pyodbc.changes +++ b/python-pyodbc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 20 20:12:59 UTC 2021 - Dirk Hartmann <2monex@gmx.net> + +- Updated spec file for compatibility with different python3 + flavours. + ------------------------------------------------------------------- Fri Mar 20 12:10:57 UTC 2020 - Marketa Calabkova diff --git a/python-pyodbc.spec b/python-pyodbc.spec index b0946ed..34f46d9 100644 --- a/python-pyodbc.spec +++ b/python-pyodbc.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyodbc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,8 +43,6 @@ even more. %prep %setup -q -n pyodbc-%{version} -mv tests2 tests-%{python2_bin_suffix} -mv tests3 tests-%{python3_bin_suffix} %build %python_build @@ -54,8 +52,8 @@ mv tests3 tests-%{python3_bin_suffix} %check export PYTHONDONTWRITEBYTECODE=1 -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} -$python tests-%{$python_bin_suffix}/sqlitetests.py -v "Driver=SQLITE3;Database=sqlite.db" +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} export TESTDIRSUFFIX=%{$python_bin_suffix} +$python tests${TESTDIRSUFFIX::1}/sqlitetests.py -v "Driver=SQLITE3;Database=sqlite.db" } %files %{python_files}