From 94bc8b39efff7f0a2d9ccc515a35307f1739abba Mon Sep 17 00:00:00 2001 From: pgbuilder_pel7x64builder0 Date: Fri, 15 May 2020 00:11:36 +0200 Subject: [PATCH] postgresql 12.1 update Signed-off-by: pgbuilder_pel7x64builder0 --- SPECS/libpq.spec | 39 ++++++++++++++++++++++------- SPECS/postgresql.spec | 58 ++++++++++++++++++++++++++++++++----------- 2 files changed, 73 insertions(+), 24 deletions(-) diff --git a/SPECS/libpq.spec b/SPECS/libpq.spec index a5dcdc3..51286fe 100644 --- a/SPECS/libpq.spec +++ b/SPECS/libpq.spec @@ -1,15 +1,16 @@ -%global majorversion 11 +%global majorversion 12 +%global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %majorversion.5 +Version: %{majorversion}.1 Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ -Source0: https://ftp.postgresql.org/pub/source/v%version/postgresql-%version.tar.bz2 -Source1: https://ftp.postgresql.org/pub/source/v%version/postgresql-%version.tar.bz2.sha256 +Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 +Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256 # Comments for these patches are in the patch files. @@ -26,7 +27,7 @@ BuildRequires: openldap-devel BuildRequires: gettext BuildRequires: multilib-rpm-config -Obsoletes: postgresql-libs < %majorversion +Obsoletes: postgresql-libs < %obsoletes_version Provides: postgresql-libs = %version-%release @@ -45,7 +46,7 @@ Requires: %name%{?_isa} = %version-%release # most of the depending packages and the rest (those which want to build server # modules) need to be fixed to require postgresql-server-devel package. Provides: postgresql-devel = %version-%release -Obsoletes: postgresql-devel < %majorversion +Obsoletes: postgresql-devel < %obsoletes_version %description devel The libpq package provides the essential shared library for any PostgreSQL @@ -55,7 +56,7 @@ package or any clients that need to connect to a PostgreSQL server. %prep ( cd "$(dirname "%SOURCE1")" ; sha256sum -c "%SOURCE1" ) -%autosetup -n postgresql-%version -p1 +%autosetup -n postgresql-%{version} -p1 # remove .gitignore files to ensure none get into the RPMs (bug #642210) find . -type f -name .gitignore | xargs rm @@ -77,9 +78,11 @@ export SYMBOL_VERSION_PREFIX=RHPG_ --datadir=%_datadir/pgsql %global build_subdirs \\\ + src/include \\\ + src/common \\\ + src/port \\\ src/interfaces/libpq \\\ - src/bin/pg_config \\\ - src/include + src/bin/pg_config for subdir in %build_subdirs; do %make_build -C "$subdir" @@ -127,6 +130,24 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Nov 25 2019 Patrik Novotný - 12.1-1 +- Rebase to upstream release 12.1 + +* Thu Oct 03 2019 Patrik Novotný - 12.0-1 +- Rebase to upstream release 12.0 + +* Thu Sep 12 2019 Patrik Novotný - 12.0-0.2 +- Rebase to upstream release 12beta4 + +* Wed Jul 03 2019 Patrik Novotný - 12.0-0.1 +- Rebase to upstream release 12beta2-1 + +* Fri May 10 2019 Pavel Raiskup - 11.3-2 +- obsolete anything < %%majorversion+1 + +* Thu May 09 2019 Patrik Novotný - 11.3-1 +- New upstream version 11.3 + * Mon Feb 18 2019 Pavel Raiskup - 11.2-2 - fix dnf system-upgrade from f29 to f29+, rhbz#1677849 diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index f96ebcb..4c2bab7 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -58,8 +58,8 @@ Summary: PostgreSQL client programs Name: postgresql -%global majorversion 11 -Version: 11.5 +%global majorversion 12 +Version: %{majorversion}.1 Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -71,14 +71,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.7 -%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 @@ -236,6 +237,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 @@ -244,6 +248,7 @@ needed to compile PostgreSQL server extension. %package test-rpm-macros Summary: Convenience RPM macros for build-time testing against PostgreSQL server Requires: %{name}-server = %precise_version +BuildArch: noarch %description test-rpm-macros This package is meant to be added as BuildRequires: dependency of other packages @@ -356,7 +361,7 @@ benchmarks. sha256sum -c %{SOURCE17} %endif ) -%setup -q -a 12 +%setup -q -a 12 -n postgresql-%{version} %patch1 -p1 %patch2 -p1 %patch5 -p1 @@ -397,7 +402,7 @@ cd postgresql-setup-%{setup_version} sed -i 's|/etc/redhat-release;|/etc/powerel-release;|' configure %configure \ - pgdocdir=%{_docdir}/%{name}/ \ + pgdocdir=%{_pkgdocdir} \ PGVERSION=%{version} \ PGMAJORVERSION=%{majorversion} \ NAME_DEFAULT_PREV_SERVICE=postgresql @@ -658,9 +663,9 @@ cd postgresql-setup-%{setup_version} make install DESTDIR=$RPM_BUILD_ROOT cd .. -# For some reason, having '%%doc %%{_docdir}/%{name}//README.rpm-dist' in %%files +# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files # causes FTBFS (at least on RHEL6), see rhbz#1250006. -mv $RPM_BUILD_ROOT/%{_docdir}/%{name}//README.rpm-dist ./ +mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./ cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf < - 12.1-1 +- Rebase to upstream release 12.1 + +* Thu Oct 03 2019 Patrik Novotný - 12.0-1 +- Rebase to upstream release 12.0 + +* Thu Sep 12 2019 Patrik Novotný - 12.0-0.3 +- Rebase to upstream beta release 12beta4 +- postgresql-server-devel requires krb5-devel + +* Thu Aug 08 2019 Petr Kubat - 12.0-0.2 +- Rebase to upstream beta release 12beta3 + +* Wed Jul 03 2019 Patrik Novotný - 12.0-0.1 +- Rebase to upstream beta release 12beta2 + +* Fri May 31 2019 Jitka Plesnikova - 11.3-2 +- Perl 5.30 rebuild + +* Thu May 09 2019 Patrik Novotný - 11.3-1 +- Rebase to upstream release 11.3 + https://www.postgresql.org/docs/11/release-11-3.html + * Tue Mar 05 2019 Pavel Raiskup - 11.2-3 - update postgresql-setup to 8.4 (related to rhbz#1668301)