From 5f7d88c5e80347923f309477464395a5229d2b84e5e438c5ad04e2d53a2cf090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 4 Jul 2019 13:22:29 +0000 Subject: [PATCH] - Update to 3.28.0-r1: * No changelog - Add patch to build with python 3.8: * python38.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apsw?expand=0&rev=11 --- 3.28.0-r1.tar.gz | 3 +++ apsw-3.9.2-r1.tar.gz | 3 --- python-apsw.changes | 8 ++++++++ python-apsw.spec | 22 ++++++++++++---------- python38.patch | 24 ++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 3.28.0-r1.tar.gz delete mode 100644 apsw-3.9.2-r1.tar.gz create mode 100644 python38.patch diff --git a/3.28.0-r1.tar.gz b/3.28.0-r1.tar.gz new file mode 100644 index 0000000..cb18831 --- /dev/null +++ b/3.28.0-r1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0347dd778f40e6d97ceeb3c469a5a06a64b1c69bb17d4a6e2c00db7ec38e2845 +size 307002 diff --git a/apsw-3.9.2-r1.tar.gz b/apsw-3.9.2-r1.tar.gz deleted file mode 100644 index fba580d..0000000 --- a/apsw-3.9.2-r1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270 -size 2607431 diff --git a/python-apsw.changes b/python-apsw.changes index 412bca8..d00b09c 100644 --- a/python-apsw.changes +++ b/python-apsw.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 4 13:10:16 UTC 2019 - Tomáš Chvátal + +- Update to 3.28.0-r1: + * No changelog +- Add patch to build with python 3.8: + * python38.patch + ------------------------------------------------------------------- Thu Aug 31 16:45:50 UTC 2017 - toddrme2178@gmail.com diff --git a/python-apsw.spec b/python-apsw.spec index aee9dc1..438ced1 100644 --- a/python-apsw.spec +++ b/python-apsw.spec @@ -1,7 +1,7 @@ # # spec file for package python-apsw # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define tarver 3.28.0-r1 Name: python-apsw -Version: 3.9.2_r1 -%define tarver 3.9.2-r1 +Version: 3.28.0_r1 Release: 0 Summary: Another Python SQLite Wrapper License: Zlib Group: Development/Libraries/Python -Url: https://github.com/rogerbinns/apsw/ -Source: https://files.pythonhosted.org/packages/source/a/apsw/apsw-%{tarver}.tar.gz +URL: https://github.com/rogerbinns/apsw/ +Source: https://github.com/rogerbinns/apsw/archive/%{tarver}.tar.gz +Patch0: python38.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: sqlite3-devel - %python_subpackages %description @@ -41,6 +42,7 @@ complete SQLite API into Python. %prep %setup -q -n apsw-%{tarver} +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -57,8 +59,8 @@ $python setup.py clean } %files %{python_files} -%defattr(-,root,root) -%{python_sitearch}/apsw*.so -%{python_sitearch}/apsw-%{version}-py*.egg-info +%license LICENSE +%doc README.rst +%{python_sitearch}/* %changelog diff --git a/python38.patch b/python38.patch new file mode 100644 index 0000000..7596c7b --- /dev/null +++ b/python38.patch @@ -0,0 +1,24 @@ +@@ -69,6 +69,9 @@ static void AddTraceBackHere(const char *filename, int lineno, const char *funct + /* make the dummy code object */ + code = PyCode_New( + 0, /*int argcount,*/ ++#if PY_VERSION_HEX >= 0x030800A4 ++ 0, /*int posonlyargcount*/ ++#endif + #if PY_VERSION_HEX >= 0x03000000 + 0, /*int kwonlyargcount*/ + #endif +Index: apsw-3.28.0-r1/src/traceback.c +=================================================================== +--- apsw-3.28.0-r1.orig/src/traceback.c ++++ apsw-3.28.0-r1/src/traceback.c +@@ -69,6 +69,9 @@ static void AddTraceBackHere(const char + /* make the dummy code object */ + code = PyCode_New( + 0, /*int argcount,*/ ++#if PY_VERSION_HEX >= 0x030800A4 ++ 0, /*int posonlyargcount*/ ++#endif + #if PY_VERSION_HEX >= 0x03000000 + 0, /*int kwonlyargcount*/ + #endif