.gitignore

@@ -1 +1 @@
-SOURCES/psycopg2-2.8.6.tar.gz
+SOURCES/psycopg2-2.9.9.tar.gz

.python-psycopg2.metadata

@@ -1 +1 @@
-6230aedfe58e8d5d132b01ac065f47284b21d78c SOURCES/psycopg2-2.8.6.tar.gz
+eb05a19f9fd0934801122fcf065767835555e8a5 SOURCES/psycopg2-2.9.9.tar.gz

SOURCES/test_types_extras-2.9.3-test_from_tables.patch

@@ -0,0 +1,54 @@
+--- tests/test_types_extras.py-orig	2021-12-29 13:51:56.000000000 +0100
++++ tests/test_types_extras.py	2022-05-17 11:23:12.476001589 +0200
+@@ -616,51 +616,6 @@
+         curs.execute("select (1,2)::type_ii")
+         self.assertRaises(psycopg2.DataError, curs.fetchone)
+ 
+-    @slow
+-    @skip_if_no_composite
+-    @skip_before_postgres(8, 4)
+-    def test_from_tables(self):
+-        curs = self.conn.cursor()
+-        curs.execute("""create table ctest1 (
+-            id integer primary key,
+-            temp int,
+-            label varchar
+-        );""")
+-
+-        curs.execute("""alter table ctest1 drop temp;""")
+-
+-        curs.execute("""create table ctest2 (
+-            id serial primary key,
+-            label varchar,
+-            test_id integer references ctest1(id)
+-        );""")
+-
+-        curs.execute("""insert into ctest1 (id, label) values
+-                (1, 'test1'),
+-                (2, 'test2');""")
+-        curs.execute("""insert into ctest2 (label, test_id) values
+-                ('testa', 1),
+-                ('testb', 1),
+-                ('testc', 2),
+-                ('testd', 2);""")
+-
+-        psycopg2.extras.register_composite("ctest1", curs)
+-        psycopg2.extras.register_composite("ctest2", curs)
+-
+-        curs.execute("""
+-            select ctest1, array_agg(ctest2) as test2s
+-            from (
+-                select ctest1, ctest2
+-                from ctest1 inner join ctest2 on ctest1.id = ctest2.test_id
+-                order by ctest1.id, ctest2.label
+-            ) x group by ctest1;""")
+-
+-        r = curs.fetchone()
+-        self.assertEqual(r[0], (1, 'test1'))
+-        self.assertEqual(r[1], [(1, 'testa', 1), (2, 'testb', 1)])
+-        r = curs.fetchone()
+-        self.assertEqual(r[0], (2, 'test2'))
+-        self.assertEqual(r[1], [(3, 'testc', 2), (4, 'testd', 2)])
+ 
+     @skip_if_no_composite
+     def test_non_dbapi_connection(self):

SPECS/python-psycopg2.spec

@@ -49,13 +49,13 @@ features offered by PostgreSQL.
 
 Summary:	%{sum}
 Name:		python-%{srcname}
-Version:	2.8.6
+Version:	2.9.9
 Release:	6%{?dist}
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
-License:	LGPLv3+ with exceptions
+License:	LGPL-3.0-or-later WITH openvpn-openssl-exception
-Url:		http://initd.org/psycopg/
+Url:		https://www.psycopg.org/
 
-Source0:	http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-%{version}.tar.gz
+Source0:	https://github.com/psycopg/psycopg2/archive/%{version}/psycopg2-%{version}.tar.gz
 
 %{?with_python2:BuildRequires:	python2-devel python2-setuptools}
 %{?with_python3:BuildRequires:	python3-devel python3-setuptools}
@@ -63,7 +63,8 @@ Source0:	http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-%{version}.tar.g
 %{?with_python3_debug:BuildRequires:	python3-debug}
 
 BuildRequires:	gcc
-BuildRequires:	pkgconfig(libpq)
+BuildRequires:	libpq-devel
+BuildRequires:	python-sphinx
 
 # For testsuite
 %if %{with tests}
@@ -72,6 +73,10 @@ BuildRequires:	postgresql-test-rpm-macros
 
 Conflicts:	python-psycopg2-zope < %{version}
 
+# Remove test 'test_from_tables' for s390 architecture
+# from ./tests/test_types_extras.py
+Patch0: test_types_extras-2.9.3-test_from_tables.patch
+
 %description
 %{desc}
 
@@ -118,7 +123,7 @@ Summary: %{sum} 3
 
 
 %package -n python3-%{srcname}-tests
-Summary: A testsuite for %sum 2
+Summary: A testsuite for %sum 3
 Requires: python3-%srcname = %version-%release
 
 %description -n python3-%{srcname}-tests
@@ -144,9 +149,6 @@ Summary:	Documentation for psycopg python PostgreSQL database adapter
 %{?with_python2:Provides: python2-%{srcname}-doc = %{version}-%{release}}
 %{?with_python3:Provides: python3-%{srcname}-doc = %{version}-%{release}}
 
-# For a smoother upgrade from RHEL 8
-%{?with_python3:Obsoletes: python39-psycopg2-doc < %{version}-%{release}}
-
 %description doc
 Documentation and example files for the psycopg python PostgreSQL
 database adapter.
@@ -166,8 +168,13 @@ Zope Database Adapter for PostgreSQL, called ZPsycopgDA
 
 
 %prep
-%autosetup -p1 -n psycopg2-%{version}
+%setup -q -n psycopg2-%{version}
 
+# The patch is applied only for s390 architecture as 
+# on other architectures the test works
+%ifarch s390x s390
+%patch0 -p0
+%endif
 
 %build
 export CFLAGS=${RPM_OPT_FLAGS} LDFLAGS=${RPM_LD_FLAGS}
@@ -184,7 +191,13 @@ for i in `find doc -iname "*.css"`; do sed -i 's/\r//' $i; done
 
 # We can not build docs now:
 # https://www.postgresql.org/message-id/2741387.dvL6Cb0VMB@nb.usersys.redhat.com
-# make -C doc/src html
+# as the bug was sorted, we can build the documentation again
+
+# Remove design formatting package
+sed -i '/better_theme_path/d' doc/src/conf.py
+sed -i "/html_theme = 'better'/d" doc/src/conf.py
+
+make html -C doc/src
 
 
 %check
@@ -232,9 +245,6 @@ done
 %{__cp} -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir}
 %endif
 
-# This test is skipped on 3.7 and has a syntax error so brp-python-bytecompile would choke on it
-%{?with_python3:rm -r %{buildroot}%{python3_sitearch}/%{srcname}/tests/test_async_keyword.py}
-
 %if %{with python2}
 %files -n python2-psycopg2
 %license LICENSE
@@ -285,7 +295,7 @@ done
 
 %files doc
 %license LICENSE
-%doc doc
+%doc doc/src/_build/html
 
 
 %if %zope
@@ -301,18 +311,69 @@ done
 
 
 %changelog
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 2.8.6-6
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.9.9-6
-- Add automatically generated Obsoletes tag with the python39- prefix
+- Bump release for October 2024 mass rebuild:
-  for smoother upgrade from RHEL8
+  Resolves: RHEL-64018
-- Add manual Obsoletes for python39-psycopg2-doc
+
-- Related: rhbz#1990421
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.9.9-5
-
+- Bump release for June 2024 mass rebuild
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.8.6-5
+
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-4
-  Related: rhbz#1991688
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
+
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.8.6-4
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 16 2024 Miro Hrončok <mhroncok@redhat.com> - 2.9.9-2
+- Fix URL and Source URL
+
+* Mon Dec 11 2023 Ondrej Sloup <osloup@redhat.com> -  2.9.9-1
+- Rebase to the latest upstream version
+
+* Fri Nov 03 2023 Ondrej Sloup <osloup@redhat.com> -  2.9.6-4
+- Update license and use SPDX formula according to fedora-license-data
+- https://gitlab.com/fedora/legal/fedora-license-data/-/issues/153
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 2.9.6-2
+- Rebuilt for Python 3.12
+
+* Fri May 05 2023 Ondrej Sloup <osloup@redhat.com> -  2.9.6-1
+- Rebase to the latest upstream version
+- Resolves rhbz#2171683
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 14 2022 Filip Janus <fjanus@redhat.co> - 2.9.3-5
+- Build directly with libpq-devel
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.9.3-4
+- Rebuilt for Python 3.11
+
+* Fri May 13 2022 Ondrej Sloup <osloup@redhat.com> - 2.9.3-3
+- Remove test test_from_tables failing on s390x
+- Make docs
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 7 2022 Devrim Gündüz <devrim@gunduz.org> - 2.9.3-1
+- Update to 2.9.3
+
+* Tue Aug 03 2021 Filip Januš <fjanus@redhat.com> - 2.9.1-1
+- Update to 2.9.1
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 2.8.6-4
+- Rebuilt for Python 3.10
 
 * Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 2.8.6-3
 - rebuild for libpq ABI fix rhbz#1908268