Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-psycopg2cffi for
openSUSE:Factory checked in at 2022-10-14 15:42:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-psycopg2cffi (Old)
and /work/SRC/openSUSE:Factory/.python-psycopg2cffi.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psycopg2cffi"
Fri Oct 14 15:42:44 2022 rev:3 rq:1010621 version:2.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-psycopg2cffi/python-psycopg2cffi.changes
2021-10-12 21:51:42.664074235 +0200
+++
/work/SRC/openSUSE:Factory/.python-psycopg2cffi.new.2275/python-psycopg2cffi.changes
2022-10-14 15:44:00.540065650 +0200
@@ -1,0 +2,5 @@
+Fri Oct 14 08:13:54 UTC 2022 - Daniel Garcia <[email protected]>
+
+- Add allow-rc-versions.patch to fix build with 15rc2 pg version
+
+-------------------------------------------------------------------
New:
----
allow-rc-versions.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-psycopg2cffi.spec ++++++
--- /var/tmp/diff_new_pack.8W0e2c/_old 2022-10-14 15:44:00.924066291 +0200
+++ /var/tmp/diff_new_pack.8W0e2c/_new 2022-10-14 15:44:00.932066304 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-psycopg2cffi
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
License: LGPL-3.0-or-later
URL: https://github.com/chtd/psycopg2cffi
Source:
https://files.pythonhosted.org/packages/source/p/psycopg2cffi/psycopg2cffi-%{version}.tar.gz
+# PATCH-FEATURE-OPENSUSE allow-rc-versions.patch to allow 15rc2 pg version
+Patch: allow-rc-versions.patch
BuildRequires: %{python_module devel >= 3.5}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -43,7 +45,7 @@
This is a implementation of the psycopg2 module using cffi.
%prep
-%setup -q -n psycopg2cffi-%{version}
+%autosetup -p1 -n psycopg2cffi-%{version}
%build
export CFLAGS="%{optflags}"
++++++ allow-rc-versions.patch ++++++
Index: psycopg2cffi-2.9.0/psycopg2cffi/_impl/_build_libpq.py
===================================================================
--- psycopg2cffi-2.9.0.orig/psycopg2cffi/_impl/_build_libpq.py
+++ psycopg2cffi-2.9.0/psycopg2cffi/_impl/_build_libpq.py
@@ -152,10 +152,12 @@ Please add the directory containing pg_c
pgversion = '7.4.0'
verre = re.compile(
- r'(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+)?)')
+ r'(\d+)(\.(\d+))?(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+)?)')
m = verre.match(pgversion)
if m:
- pgmajor, pgminor, pgpatch = m.group(1, 2, 3)
+ pgmajor, pgminor, pgpatch = m.group(1, 3, 4)
+ if pgminor is None or not pgminor.isdigit():
+ pgminor = 0
if pgpatch is None or not pgpatch.isdigit():
pgpatch = 0
else:
