diff --git a/python-psycopg2.spec b/python-psycopg2.spec index a4accf6..a2f0853 100644 --- a/python-psycopg2.spec +++ b/python-psycopg2.spec @@ -48,14 +48,13 @@ features offered by PostgreSQL. Summary: %{sum} Name: python-%{srcname} -Version: 2.7.7 -Release: 5%{?dist} +Version: 2.8.3 +Release: 1%{?dist} # The exceptions allow linking to OpenSSL and PostgreSQL's libpq License: LGPLv3+ with exceptions Url: http://www.psycopg.org/psycopg/ -Source0: http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-7/psycopg2-%{version}.tar.gz -patch0: python38.patch +Source0: http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-%{version}.tar.gz %{?with_python2:BuildRequires: python2-devel} %{?with_python3:BuildRequires: python3-devel} @@ -177,7 +176,7 @@ for i in `find doc -iname "*.html"`; do sed -i 's/\r//' $i; done for i in `find doc -iname "*.css"`; do sed -i 's/\r//' $i; done # Get rid of a "hidden" file that rpmlint complains about -rm -f doc/html/.buildinfo +%{__rm} -f doc/html/.buildinfo # We can not build docs now: # https://www.postgresql.org/message-id/2741387.dvL6Cb0VMB@nb.usersys.redhat.com @@ -211,8 +210,8 @@ for python in %{python_runtimes} ; do done %if %zope -install -d %{buildroot}%{ZPsycopgDAdir} -cp -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir} +%{__install} -d %{buildroot}%{ZPsycopgDAdir} +%{__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 @@ -284,6 +283,9 @@ cp -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir} %changelog +* Mon Sep 09 2019 Devrim Gündüz - 2.8.3-1 +- Update to 2.8.3 + * Mon Sep 09 2019 Miro Hrončok - 2.7.7-5 - Package python2-psycopg2-debug removed on Fedora 32+ (rhbz#1747670) diff --git a/python38.patch b/python38.patch deleted file mode 100644 index bc86e79..0000000 --- a/python38.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/psycopg/psycopgmodule.c b/psycopg/psycopgmodule.c -index 5deaa16..f35d574 100644 ---- a/psycopg/psycopgmodule.c -+++ b/psycopg/psycopgmodule.c -@@ -677,6 +677,10 @@ psyco_set_error(PyObject *exc, cursorObject *curs, const char *msg) - static int - psyco_is_main_interp(void) - { -+#if PY_VERSION_HEX >= 0x03080000 -+ /* tested with Python 3.8.0a2 */ -+ return _PyInterpreterState_Get() == PyInterpreterState_Main(); -+#else - static PyInterpreterState *main_interp = NULL; /* Cached reference */ - PyInterpreterState *interp; - -@@ -692,6 +696,7 @@ psyco_is_main_interp(void) - main_interp = interp; - assert (main_interp); - return psyco_is_main_interp(); -+#endif - } - - diff --git a/sources b/sources index 607092e..666609c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (psycopg2-2.7.7.tar.gz) = 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0 +SHA512 (psycopg2-2.8.3.tar.gz) = 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928