From 87384430b2acd1985ebca25887910597f2e83f4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 11:10:07 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgresql.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index ff118c2..eff3b2f 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.4 -Release: 1%{?dist} +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -1210,6 +1210,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 11.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 09 2019 Petr Kubat - 11.4-1 - New upstream version 11.4 https://www.postgresql.org/docs/11/release-11-4.html From 910a512dd4bc95f237e21ec535b8d96bd5ad0331 Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Wed, 7 Aug 2019 07:44:49 +0200 Subject: [PATCH 02/15] New upstream release 11.5 Per release notes: https://www.postgresql.org/docs/11/release-11-5.htm --- postgresql.spec | 10 +++++++--- sources | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index eff3b2f..944252f 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -59,8 +59,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 -Version: 11.4 -Release: 2%{?dist} +Version: 11.5 +Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -71,7 +71,7 @@ Url: http://www.postgresql.org/ # in-place upgrade of an old database. In most cases it will not be critical # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. -%global prevversion 10.9 +%global prevversion 10.10 %global prevmajorversion 10 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -1210,6 +1210,10 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Wed Aug 07 2019 Petr Kubat - 11.5-1 +- New upstream version 11.5 + https://www.postgresql.org/docs/11/release-11-5.html + * Fri Jul 26 2019 Fedora Release Engineering - 11.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 932fa8b..1f8f92f 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (postgresql-10.9.tar.bz2) = 4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e -SHA512 (postgresql-10.9.tar.bz2.sha256) = 95b1a8bdc442ea79d82d0362cef048af851999b3e79764b0dfbc19742814e2be5fb6132b1b4bdac24b6ee0965e8825872c37c9a45038e9da5ccb85fc6498af57 -SHA512 (postgresql-11.4.tar.bz2) = 159fb84134e05ddc58e40a879ca52ed4d58ced7bcd1e7310d59bda84f9055339a31a92cfaab2c063a88685f7417b9a828534394bf9a2477fc33d1fb6cd26186b -SHA512 (postgresql-11.4.tar.bz2.sha256) = 9cceb9ae6403ad97ba3ae7f3eac67576b6fa216a65feb509217d4b69d2d53d3cc50160508a24770f4b9e450c97832494228b2644f0f8522d4c5a49540bf40ad7 +SHA512 (postgresql-10.10.tar.bz2) = 60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc +SHA512 (postgresql-10.10.tar.bz2.sha256) = 02eb827dd227e66b11f10187434da7c6e6e059ad85411fd872ac435a56c6c9ac2d9048e97c1bdb6559a7cee9b1e692a3568e57a4c86169548224ac51850dab97 +SHA512 (postgresql-11.5.tar.bz2) = 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 +SHA512 (postgresql-11.5.tar.bz2.sha256) = 73810583ae0ff2aadcb3e88d7369e9c49b02b5e5f31e5199620019c7c897b7397e4f230c7b76388c114c6c70be71fc7cc061263abb4a2dc71d2a3d58affae73f SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 -SHA512 (postgresql-11.4-US.pdf) = 43098eb35d1a3c50e1e3dc06cd0658bf2d61ee1550d2199bc2bbb659cd73b5885609254c32687add1264eba70bb672f1e1dc9b70c798a04ae26b8eab1625b7e5 +SHA512 (postgresql-11.5-US.pdf) = 89b7280fb6da5d56a244a0db8776eea2f5e59683b3eb01bbfd04d8120acc53ee7e930393ed521b0ef9ba4bfb02483d29e1502e240104dad963e30a634b84ebb9 From 2c626b6e5dd34b101e354c191238021940994a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:22:46 +0200 Subject: [PATCH 03/15] Rebuilt for Python 3.8 --- postgresql.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 944252f..6d01a6e 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.5 -Release: 1%{?dist} +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -1210,6 +1210,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Mon Aug 19 2019 Miro Hrončok - 11.5-2 +- Rebuilt for Python 3.8 + * Wed Aug 07 2019 Petr Kubat - 11.5-1 - New upstream version 11.5 https://www.postgresql.org/docs/11/release-11-5.html From 5c5f24923929d12a86604e03774fca9a9ad1d623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 2 Sep 2019 16:39:17 +0200 Subject: [PATCH 04/15] plpython: rename to plpython2 Related: BZ#1738814 --- postgresql.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 6d01a6e..13bc2ba 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.5 -Release: 2%{?dist} +Release: 3%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -300,10 +300,10 @@ Install this if you want to write database functions in Perl. %if %plpython -%package plpython +%package plpython2 Summary: The Python2 procedural language for PostgreSQL Requires: %{name}-server%{?_isa} = %precise_version -Provides: %{name}-plpython2 = %precise_version +Provides: %{name}-plpython = %precise_version %description plpython The postgresql-plpython package contains the PL/Python procedural language, @@ -1210,6 +1210,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Mon Sep 02 2019 Patrik Novotný - 11.5-3 +- Rename plpython to plpython2 and provide plpython virtually. + * Mon Aug 19 2019 Miro Hrončok - 11.5-2 - Rebuilt for Python 3.8 From 3de7e5024ce09bce9d346ef6e40898a101b46b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 2 Sep 2019 16:47:12 +0200 Subject: [PATCH 05/15] Fix %files and %description after renaming plpython --- postgresql.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 13bc2ba..3f05222 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -305,7 +305,7 @@ Summary: The Python2 procedural language for PostgreSQL Requires: %{name}-server%{?_isa} = %precise_version Provides: %{name}-plpython = %precise_version -%description plpython +%description plpython2 The postgresql-plpython package contains the PL/Python procedural language, which is an extension to the PostgreSQL database server. Install this if you want to write database functions in Python 2. @@ -1189,7 +1189,7 @@ make -C postgresql-setup-%{setup_version} check %if %plpython -%files plpython -f plpython.lst +%files plpython2 -f plpython.lst %{_datadir}/pgsql/extension/plpython2* %{_datadir}/pgsql/extension/plpythonu* %{_libdir}/pgsql/plpython2.so From f25f4d7c5d5a77b7ec258e1be3f7b66c3af6a59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 3 Sep 2019 12:09:02 +0200 Subject: [PATCH 06/15] Add explicit obsoletes to plpython2 package --- postgresql.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 3f05222..b7a8f85 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.5 -Release: 3%{?dist} +Release: 4%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -304,6 +304,7 @@ Install this if you want to write database functions in Perl. Summary: The Python2 procedural language for PostgreSQL Requires: %{name}-server%{?_isa} = %precise_version Provides: %{name}-plpython = %precise_version +Obsoletes: %{name}-plpython < %precise_version %description plpython2 The postgresql-plpython package contains the PL/Python procedural language, @@ -1210,6 +1211,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Tue Sep 03 2019 Patrik Novotný - 11.5-4 +- Add explicit obsoletes to plpython2 package + * Mon Sep 02 2019 Patrik Novotný - 11.5-3 - Rename plpython to plpython2 and provide plpython virtually. From f86d009fdca6547d92af28e7526075e66e31c157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 5 Sep 2019 16:02:16 +0200 Subject: [PATCH 07/15] postgresql-server-devel requires krb5-devel Fixes: BZ#1736425 Version: 11.5-5 --- postgresql.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index b7a8f85..1fddb14 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.5 -Release: 4%{?dist} +Release: 5%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -236,6 +236,9 @@ Summary: PostgreSQL development header files and libraries %if %icu Requires: libicu-devel %endif +%if %kerberos +Requires: krb5-devel +%endif %description server-devel The postgresql-server-devel package contains the header files and configuration @@ -1211,6 +1214,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Sep 05 2019 Patrik Novotný - 11.5-5 +- postgresql-server-devel requires krb5-devel + * Tue Sep 03 2019 Patrik Novotný - 11.5-4 - Add explicit obsoletes to plpython2 package From 95a1777ae4ba705bcef3374b9ca68244367ce44b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 28 Sep 2019 10:39:51 +0000 Subject: [PATCH 08/15] Own %{_libdir}/pgsql in postgresql-server --- postgresql.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postgresql.spec b/postgresql.spec index 1fddb14..9286c6f 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -1099,6 +1099,7 @@ make -C postgresql-setup-%{setup_version} check %{_datadir}/pgsql/tsearch_data/ %dir %{_datadir}/postgresql-setup %{_datadir}/postgresql-setup/library.sh +%dir %{_libdir}/pgsql %{_libdir}/pgsql/*_and_*.so %{_libdir}/pgsql/dict_snowball.so %{_libdir}/pgsql/euc2004_sjis2004.so From 368b14b6a5cc391b5d5005d8a1fe8ad50dac6510 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 1 Nov 2019 15:51:23 +0000 Subject: [PATCH 09/15] Rebuild for ICU 65 --- postgresql.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 9286c6f..03e01e4 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.5 -Release: 5%{?dist} +Release: 6%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -1215,6 +1215,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Nov 01 2019 Pete Walter - 11.5-6 +- Rebuild for ICU 65 + * Thu Sep 05 2019 Patrik Novotný - 11.5-5 - postgresql-server-devel requires krb5-devel From b70ea669e07874fe7cc0073726ab858c088c5f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 25 Nov 2019 15:26:58 +0100 Subject: [PATCH 10/15] Rebase to upstream version 11.6 --- postgresql.spec | 9 ++++++--- sources | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 03e01e4..72b9e73 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -59,8 +59,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 -Version: 11.5 -Release: 6%{?dist} +Version: 11.6 +Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -71,7 +71,7 @@ Url: http://www.postgresql.org/ # in-place upgrade of an old database. In most cases it will not be critical # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. -%global prevversion 10.10 +%global prevversion 10.11 %global prevmajorversion 10 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -1215,6 +1215,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Mon Nov 25 2019 Patrik Novotný - 11.6-1 +- Rebase to upstream version 11.6 + * Fri Nov 01 2019 Pete Walter - 11.5-6 - Rebuild for ICU 65 diff --git a/sources b/sources index 1f8f92f..2e24595 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (postgresql-10.10.tar.bz2) = 60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc -SHA512 (postgresql-10.10.tar.bz2.sha256) = 02eb827dd227e66b11f10187434da7c6e6e059ad85411fd872ac435a56c6c9ac2d9048e97c1bdb6559a7cee9b1e692a3568e57a4c86169548224ac51850dab97 -SHA512 (postgresql-11.5.tar.bz2) = 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 -SHA512 (postgresql-11.5.tar.bz2.sha256) = 73810583ae0ff2aadcb3e88d7369e9c49b02b5e5f31e5199620019c7c897b7397e4f230c7b76388c114c6c70be71fc7cc061263abb4a2dc71d2a3d58affae73f +SHA512 (postgresql-10.11.tar.bz2) = ce90b34e74d423b6db1f0e840b8e09579965c020fa2cfe3e567b604d3354d91e00a4347d559876be829aa89db44f84736e154495708ba9908f1d850446a1fc7b +SHA512 (postgresql-10.11.tar.bz2.sha256) = 1e98c65329440b032896d6ac45a0fb33478b45562e5b0833e6f9d2f7a94d7a99fe78f4820f18890b37d36f9bba6def317f0fca8a73404eeb8ddfd863deea47a8 +SHA512 (postgresql-11.6.tar.bz2) = de6833c0df8dbac7bc498ac573dc4c3645070d9bbdd6b5d89db3ef41e86e7fc19d5e6450aa46ee2a1392d86c33acf6b9364b2863caac49f45351a46647feecbd +SHA512 (postgresql-11.6.tar.bz2.sha256) = cb462b2ed50c6cb1e6afe914cae9a6a47fb81bcca313b1489e36a61fa0b5fa884b201e81e105fb361f344b2ccd3e123267438513bf534276d9f629f6ac3a48ce SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 -SHA512 (postgresql-11.5-US.pdf) = 89b7280fb6da5d56a244a0db8776eea2f5e59683b3eb01bbfd04d8120acc53ee7e930393ed521b0ef9ba4bfb02483d29e1502e240104dad963e30a634b84ebb9 +SHA512 (postgresql-11.6-US.pdf) = d7d4cb3290928282b393f07c65baf36902c70a8ea930c4f24aa78c66460bf54865fc38ce61980acec7c20b14cad56c4e950e94ceac1e5008ec8a21c6e4cbdf02 From 261eac466c0cd313fcdb84dc338657e6526bd54a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 09:35:22 +0000 Subject: [PATCH 11/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgresql.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 72b9e73..a663f0c 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 11 Version: 11.6 -Release: 1%{?dist} +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -1215,6 +1215,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 11.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 25 2019 Patrik Novotný - 11.6-1 - Rebase to upstream version 11.6 From 01110f9fc1b554c238f37c8a4281d29f19065647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 12 Feb 2020 14:19:52 +0100 Subject: [PATCH 12/15] Rebase to upstream release 12.1 Resolves: BZ#1801396 Version: 12.1-1 --- postgresql-external-libpq.patch | 17 ++++--- postgresql-server-pg_config.patch | 2 +- postgresql.spec | 78 ++++++++++++++++++++++++------- sources | 6 +-- 4 files changed, 74 insertions(+), 29 deletions(-) diff --git a/postgresql-external-libpq.patch b/postgresql-external-libpq.patch index 71dc609..ba7ef73 100644 --- a/postgresql-external-libpq.patch +++ b/postgresql-external-libpq.patch @@ -18,19 +18,19 @@ index bcdbd95..4bea236 100644 backend/replication/pgoutput \ fe_utils \ diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 9a4a8a3..2bdfb77 100644 +index b9d86ac..29df69f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in -@@ -513,7 +513,7 @@ endif - - # This macro is for use by libraries linking to libpq. (Because libpgport - # isn't created with the same link flags as libpq, it can't be used.) +@@ -549,7 +549,7 @@ endif + # How to link to libpq. (This macro may be used as-is by backend extensions. + # Client-side code should go through libpq_pgport or libpq_pgport_shlib, + # instead.) -libpq = -L$(libpq_builddir) -lpq +libpq = -lpq - # This macro is for use by client executables (not libraries) that use libpq. + # libpq_pgport is for use by client executables (not libraries) that use libpq. # We force clients to pull symbols from the non-shared libraries libpgport -@@ -539,7 +539,6 @@ endif +@@ -579,7 +579,6 @@ endif # Commonly used submake targets submake-libpq: | submake-generated-headers @@ -38,3 +38,6 @@ index 9a4a8a3..2bdfb77 100644 submake-libpgport: | submake-generated-headers $(MAKE) -C $(top_builddir)/src/port all +-- +2.21.0 + diff --git a/postgresql-server-pg_config.patch b/postgresql-server-pg_config.patch index 6cde037..65e379b 100644 --- a/postgresql-server-pg_config.patch +++ b/postgresql-server-pg_config.patch @@ -55,5 +55,5 @@ index 1d41f90..0f34f37 100644 # src/bin/pg_config/nls.mk -CATALOG_NAME = pg_config +CATALOG_NAME = pg_server_config - AVAIL_LANGUAGES = cs de es fr he it ja ko nb pl pt_BR ro ru sv ta tr vi zh_CN zh_TW + AVAIL_LANGUAGES = cs de es fr he it ja ko pl pt_BR ro ru sv tr uk vi zh_CN zh_TW GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c diff --git a/postgresql.spec b/postgresql.spec index a663f0c..effa949 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -32,6 +32,7 @@ %{!?beta:%global beta 0} %{!?test:%global test 1} +%{!?llvmjit:%global llvmjit 1} %{!?upgrade:%global upgrade 1} %{!?plpython:%global plpython 1} %{!?plpython3:%global plpython3 1} @@ -58,9 +59,9 @@ Summary: PostgreSQL client programs Name: postgresql -%global majorversion 11 -Version: 11.6 -Release: 2%{?dist} +%global majorversion 12 +Version: %{majorversion}.1 +Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -71,14 +72,15 @@ Url: http://www.postgresql.org/ # in-place upgrade of an old database. In most cases it will not be critical # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. -%global prevversion 10.11 -%global prevmajorversion 10 +%global prevversion 11.6 +%global prevmajorversion 11 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release %global setup_version 8.4 %global service_name postgresql.service + Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 # The PDF file is generated by generate-pdf.sh, which see for comments Source1: postgresql-%{version}-US.pdf @@ -303,13 +305,12 @@ Install this if you want to write database functions in Perl. %if %plpython -%package plpython2 +%package plpython Summary: The Python2 procedural language for PostgreSQL Requires: %{name}-server%{?_isa} = %precise_version -Provides: %{name}-plpython = %precise_version -Obsoletes: %{name}-plpython < %precise_version +Provides: %{name}-plpython2 = %precise_version -%description plpython2 +%description plpython The postgresql-plpython package contains the PL/Python procedural language, which is an extension to the PostgreSQL database server. Install this if you want to write database functions in Python 2. @@ -352,6 +353,30 @@ PostgreSQL database management system, including regression tests and benchmarks. %endif +%if %llvmjit +%package llvmjit +Summary: Just-in-time compilation support for PostgreSQL +Requires: %{name}-server%{?_isa} = %{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} == 7 +Requires: llvm5.0 >= 5.0 +%else +Requires: llvm => 5.0 +%endif +Provides: postgresql-llvmjit >= %{version}-%{release} + +%ifarch ppc64 ppc64le +AutoReq: 0 +Requires: advance-toolchain-%{atstring}-runtime +%endif + +BuildRequires: llvm-devel >= 5.0 clang-devel >= 5.0 + +%description llvmjit +The postgresql-llvmjit package contains support for +just-in-time compiling parts of PostgreSQL queries. Using LLVM it +compiles e.g. expressions and tuple deforming into native code, with the +goal of accelerating analytics queries. +%endif %prep ( @@ -361,7 +386,7 @@ benchmarks. sha256sum -c %{SOURCE17} %endif ) -%setup -q -a 12 +%setup -q -a 12 -n postgresql-%{version} %patch1 -p1 %patch2 -p1 %patch5 -p1 @@ -471,6 +496,9 @@ common_configure_options=' %if %icu --with-icu %endif +%if %llvmjit + --with-llvm +%endif ' %if %plpython3 @@ -832,7 +860,7 @@ find_lang_bins () find_lang_bins devel.lst pg_server_config find_lang_bins server.lst \ initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql \ - postgres pg_verify_checksums + postgres pg_checksums find_lang_bins contrib.lst \ pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump find_lang_bins main.lst \ @@ -877,7 +905,7 @@ make -C postgresql-setup-%{setup_version} check # FILES sections. %files -f main.lst %doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO -%doc COPYRIGHT README HISTORY doc/bug.template +%doc COPYRIGHT README HISTORY %doc README.rpm-dist %{_bindir}/clusterdb %{_bindir}/createdb @@ -906,6 +934,11 @@ make -C postgresql-setup-%{setup_version} check %{_mandir}/man1/reindexdb.* %{_mandir}/man1/vacuumdb.* %{_mandir}/man7/* +%if %llvmjit +# Install bitcode directory along with the main package, +# so that extensions can use this dir. +%dir %{_libdir}/pgsql/bitcode +%endif %files docs @@ -971,7 +1004,6 @@ make -C postgresql-setup-%{setup_version} check %{_datadir}/pgsql/extension/seg* %{_datadir}/pgsql/extension/tablefunc* %{_datadir}/pgsql/extension/tcn* -%{_datadir}/pgsql/extension/timetravel* %{_datadir}/pgsql/extension/tsm_system_rows* %{_datadir}/pgsql/extension/tsm_system_time* %{_datadir}/pgsql/extension/unaccent* @@ -1038,7 +1070,6 @@ make -C postgresql-setup-%{setup_version} check %{_libdir}/pgsql/tablefunc.so %{_libdir}/pgsql/tcn.so %{_libdir}/pgsql/test_decoding.so -%{_libdir}/pgsql/timetravel.so %{_libdir}/pgsql/tsm_system_rows.so %{_libdir}/pgsql/tsm_system_time.so %{_libdir}/pgsql/unaccent.so @@ -1078,14 +1109,13 @@ make -C postgresql-setup-%{setup_version} check %{_bindir}/pg_recvlogical %{_bindir}/pg_resetwal %{_bindir}/pg_rewind -%{_bindir}/pg_verify_checksums +%{_bindir}/pg_checksums %{_bindir}/postgres %{_bindir}/postgresql-setup %{_bindir}/postmaster %dir %{_datadir}/pgsql %{_datadir}/pgsql/*.sample %dir %{_datadir}/pgsql/contrib -%{_datadir}/pgsql/conversion_create.sql %dir %{_datadir}/pgsql/extension %{_datadir}/pgsql/extension/plpgsql* %{_datadir}/pgsql/information_schema.sql @@ -1120,7 +1150,7 @@ make -C postgresql-setup-%{setup_version} check %{_mandir}/man1/pg_receivewal.* %{_mandir}/man1/pg_resetwal.* %{_mandir}/man1/pg_rewind.* -%{_mandir}/man1/pg_verify_checksums.* +%{_mandir}/man1/pg_checksums.* %{_mandir}/man1/postgres.* %{_mandir}/man1/postgresql-new-systemd-unit.* %{_mandir}/man1/postgresql-setup.* @@ -1158,6 +1188,8 @@ make -C postgresql-setup-%{setup_version} check %files static %{_libdir}/libpgcommon.a %{_libdir}/libpgport.a +%{_libdir}/libpgcommon_shlib.a +%{_libdir}/libpgport_shlib.a %if %upgrade @@ -1178,6 +1210,13 @@ make -C postgresql-setup-%{setup_version} check %{macrosdir}/macros.%name-upgrade %endif +%if %llvmjit +%files llvmjit +%defattr(-,root,root) +%{_libdir}/pgsql/bitcode/* +%{_libdir}/pgsql/llvmjit.so +%{_libdir}/pgsql/llvmjit_types.bc +%endif %if %plperl %files plperl -f plperl.lst @@ -1194,7 +1233,7 @@ make -C postgresql-setup-%{setup_version} check %if %plpython -%files plpython2 -f plpython.lst +%files plpython -f plpython.lst %{_datadir}/pgsql/extension/plpython2* %{_datadir}/pgsql/extension/plpythonu* %{_libdir}/pgsql/plpython2.so @@ -1215,6 +1254,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Tue Feb 11 2020 Patrik Novotný - 12.1-1 +- Rebase to upstream release 12.1 + * Thu Jan 30 2020 Fedora Release Engineering - 11.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 2e24595..b6daf41 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (postgresql-10.11.tar.bz2) = ce90b34e74d423b6db1f0e840b8e09579965c020fa2cfe3e567b604d3354d91e00a4347d559876be829aa89db44f84736e154495708ba9908f1d850446a1fc7b -SHA512 (postgresql-10.11.tar.bz2.sha256) = 1e98c65329440b032896d6ac45a0fb33478b45562e5b0833e6f9d2f7a94d7a99fe78f4820f18890b37d36f9bba6def317f0fca8a73404eeb8ddfd863deea47a8 SHA512 (postgresql-11.6.tar.bz2) = de6833c0df8dbac7bc498ac573dc4c3645070d9bbdd6b5d89db3ef41e86e7fc19d5e6450aa46ee2a1392d86c33acf6b9364b2863caac49f45351a46647feecbd SHA512 (postgresql-11.6.tar.bz2.sha256) = cb462b2ed50c6cb1e6afe914cae9a6a47fb81bcca313b1489e36a61fa0b5fa884b201e81e105fb361f344b2ccd3e123267438513bf534276d9f629f6ac3a48ce +SHA512 (postgresql-12.1.tar.bz2) = f45b1762fd60b6f7419305d108b7fc521e3a7afa833d3aacccba814465baf40d19f57ff9bf2909d726c4c94a1cd99a39f1aa8e45fd0364cdedbcbed36ff48caf +SHA512 (postgresql-12.1.tar.bz2.sha256) = 275a72bb1e27c6ec4385722cd53d7244186885a402d613d1c6a45c1173154559791713dfbdf5af11b596a867cec7eb6be949c734badd3c458b0a9345b37bd899 SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 -SHA512 (postgresql-11.6-US.pdf) = d7d4cb3290928282b393f07c65baf36902c70a8ea930c4f24aa78c66460bf54865fc38ce61980acec7c20b14cad56c4e950e94ceac1e5008ec8a21c6e4cbdf02 +SHA512 (postgresql-12.1-US.pdf) = 348001219af9a4a98b2fd54228ccf019947eefb90f971a25c3a9660135b559b3d4b8f938f965a5a2e7ffb00d05f227c73c737120c9f0794aa9744e0dca613f64 From 9637a4eb78c71a854b5624ab7a0648027a11403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 17 Feb 2020 09:18:26 +0100 Subject: [PATCH 13/15] Rebase to upstream release 12.2 Version: 12.2-1 --- postgresql.spec | 7 +++++-- sources | 11 +++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index effa949..975e679 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,7 +60,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 12 -Version: %{majorversion}.1 +Version: %{majorversion}.2 Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -72,7 +72,7 @@ Url: http://www.postgresql.org/ # in-place upgrade of an old database. In most cases it will not be critical # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. -%global prevversion 11.6 +%global prevversion 11.7 %global prevmajorversion 11 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -1254,6 +1254,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Feb 14 2020 Patrik Novotný - 12.2-1 +- Rebase to upstream release 12.2 + * Tue Feb 11 2020 Patrik Novotný - 12.1-1 - Rebase to upstream release 12.1 diff --git a/sources b/sources index b6daf41..8b427e1 100644 --- a/sources +++ b/sources @@ -1,6 +1,5 @@ -SHA512 (postgresql-11.6.tar.bz2) = de6833c0df8dbac7bc498ac573dc4c3645070d9bbdd6b5d89db3ef41e86e7fc19d5e6450aa46ee2a1392d86c33acf6b9364b2863caac49f45351a46647feecbd -SHA512 (postgresql-11.6.tar.bz2.sha256) = cb462b2ed50c6cb1e6afe914cae9a6a47fb81bcca313b1489e36a61fa0b5fa884b201e81e105fb361f344b2ccd3e123267438513bf534276d9f629f6ac3a48ce -SHA512 (postgresql-12.1.tar.bz2) = f45b1762fd60b6f7419305d108b7fc521e3a7afa833d3aacccba814465baf40d19f57ff9bf2909d726c4c94a1cd99a39f1aa8e45fd0364cdedbcbed36ff48caf -SHA512 (postgresql-12.1.tar.bz2.sha256) = 275a72bb1e27c6ec4385722cd53d7244186885a402d613d1c6a45c1173154559791713dfbdf5af11b596a867cec7eb6be949c734badd3c458b0a9345b37bd899 -SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 -SHA512 (postgresql-12.1-US.pdf) = 348001219af9a4a98b2fd54228ccf019947eefb90f971a25c3a9660135b559b3d4b8f938f965a5a2e7ffb00d05f227c73c737120c9f0794aa9744e0dca613f64 +SHA512 (postgresql-12.2.tar.bz2) = 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee +SHA512 (postgresql-12.2.tar.bz2.sha256) = 8f94163228bb7d854d6fe4924a8a2ded00f90af662dd4a7c39b415be0826d9395e55f9b8e3b472baf7c19550e7c35198a650604a28756ad85d096bcfbaa5d1fd +SHA512 (postgresql-12.2-US.pdf) = f086fead2c094e0f1148bcadaf13e240a84b53be289aa0a323295f65879699e81041b4bbc6cc3ce2744aac3fcb15083fa1cab583cd86fdc8ef626499e3cb3e71 +SHA512 (postgresql-11.7.tar.bz2) = 32c7ace228f9895241ce0d925fbfc60c0cd39f4cd35368fb10dc7db046151ffd59a9895b4c30a529627f0103051e84b4992ed60312cccd292489f3037076ca1e +SHA512 (postgresql-11.7.tar.bz2.sha256) = 1c8bc319da6bc49000f14e4636f4410b3eb52ab41b0698e7f3ee945efe8e93b6f1758e3f60d8658b0ea6836ea0f271a61031554a10e64c61d2c670e97c63812c From be3eaa25250f516f6f3bafadefed6c87173a34ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 17 Feb 2020 10:52:57 +0100 Subject: [PATCH 14/15] Fixup sources for rebase to upstream version 12.2 - missing postgresql-setup-8.4 --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 8b427e1..98aa112 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (postgresql-12.2.tar.bz2.sha256) = 8f94163228bb7d854d6fe4924a8a2ded00f90a SHA512 (postgresql-12.2-US.pdf) = f086fead2c094e0f1148bcadaf13e240a84b53be289aa0a323295f65879699e81041b4bbc6cc3ce2744aac3fcb15083fa1cab583cd86fdc8ef626499e3cb3e71 SHA512 (postgresql-11.7.tar.bz2) = 32c7ace228f9895241ce0d925fbfc60c0cd39f4cd35368fb10dc7db046151ffd59a9895b4c30a529627f0103051e84b4992ed60312cccd292489f3037076ca1e SHA512 (postgresql-11.7.tar.bz2.sha256) = 1c8bc319da6bc49000f14e4636f4410b3eb52ab41b0698e7f3ee945efe8e93b6f1758e3f60d8658b0ea6836ea0f271a61031554a10e64c61d2c670e97c63812c +SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 From 22cc719777955e91cc37c754bca52e991aeef802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 12 Mar 2020 15:42:37 +0100 Subject: [PATCH 15/15] Fix missing requirements - fix FTBFS due to named opcodes disabled in perl - fix missing requirements for server-devel package regarding the llvmjit --- postgresql.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 975e679..3246a9f 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -61,7 +61,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 12 Version: %{majorversion}.2 -Release: 1%{?dist} +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -113,6 +113,7 @@ Patch9: postgresql-server-pg_config.patch BuildRequires: gcc BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel +BuildRequires: perl(Opcode) %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-generators %endif @@ -241,6 +242,9 @@ Requires: libicu-devel %if %kerberos Requires: krb5-devel %endif +%if %llvmjit +Requires: clang-devel llvm-devel +%endif %description server-devel The postgresql-server-devel package contains the header files and configuration @@ -1254,6 +1258,10 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Mar 12 2020 Patrik Novotný - 12.2-2 +- Fix requirements for JIT in postgresql-server-devel +- Fix build issues regarding new perl update + * Fri Feb 14 2020 Patrik Novotný - 12.2-1 - Rebase to upstream release 12.2