postgresql-setup: reflect pg_upgrade movement

The pg_upgrade binary was moved from postgresql-upgrade package
into postgresql package.

Version: 9.5.0-1
This commit is contained in:
Pavel Raiskup 2016-01-07 00:14:58 +01:00
parent 2427b5ec80
commit 04a9ae75cf
3 changed files with 5 additions and 3 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
/postgresql-setup-3.5.tar.gz /postgresql-setup-4.0.tar.gz
/postgresql-9.4.5.tar.bz2 /postgresql-9.4.5.tar.bz2
/postgresql-9.4.5.tar.bz2.sha256 /postgresql-9.4.5.tar.bz2.sha256
/postgresql-9.5.0.tar.bz2 /postgresql-9.5.0.tar.bz2

View File

@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
%global prevversion 9.4.5 %global prevversion 9.4.5
%global prevmajorversion 9.4 %global prevmajorversion 9.4
%global setup_version 3.5 %global setup_version 4.0
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
# The PDF file is generated by generate-pdf.sh, which see for comments # The PDF file is generated by generate-pdf.sh, which see for comments
@ -652,6 +652,7 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf <<E
id postgresql id postgresql
major %{prevmajorversion} major %{prevmajorversion}
data_default %{_localstatedir}/pgsql/data data_default %{_localstatedir}/pgsql/data
package postgresql-upgrade
engine %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin engine %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin
description "Upgrade data from system PostgreSQL version (PostgreSQL %{prevmajorversion})" description "Upgrade data from system PostgreSQL version (PostgreSQL %{prevmajorversion})"
redhat_sockets_hack no redhat_sockets_hack no
@ -1201,6 +1202,7 @@ fi
* Wed Jan 06 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.0-1 * Wed Jan 06 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.0-1
- update to 9.5.0 per release notes - update to 9.5.0 per release notes
http://www.postgresql.org/docs/9.5/static/release-9-5.html http://www.postgresql.org/docs/9.5/static/release-9-5.html
- update postgresql-setup to v4.0 to reflect new packaging style
* Wed Dec 16 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.4.5-5 * Wed Dec 16 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.4.5-5
- fixed problem with xml2 test (rhbz#1286692) - fixed problem with xml2 test (rhbz#1286692)

View File

@ -4,4 +4,4 @@ dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2 e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256 809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz 3cd80dbdb03dba0131d7b6a11ae1a24c postgresql-setup-4.0.tar.gz