diff --git a/.gitignore b/.gitignore
index 3c64661..8e57172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/postgresql-setup-3.4.tar.gz
-/postgresql-9.3.10.tar.bz2
-/postgresql-9.3.10.tar.bz2.sha256
+/postgresql-setup-3.5.tar.gz
/postgresql-9.4.5.tar.bz2
/postgresql-9.4.5.tar.bz2.sha256
-/postgresql-9.4.5-US.pdf
+/postgresql-9.5.0.tar.bz2
+/postgresql-9.5.0.tar.bz2.sha256
+/postgresql-9.5.0-US.pdf
diff --git a/postgresql-fix-xml2.patch b/postgresql-fix-xml2.patch
deleted file mode 100644
index 6b97017..0000000
--- a/postgresql-fix-xml2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
-index 9b7b393..72f0be3 100644
---- a/src/test/regress/expected/xml.out
-+++ b/src/test/regress/expected/xml.out
-@@ -9,8 +9,6 @@ ERROR: invalid XML content
- LINE 1: INSERT INTO xmltest VALUES (3, '', NULL, '');
- xmlconcat
- --------------
-@@ -212,16 +208,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
- &
- ^
- line 1: chunk is not well balanced
--&
-- ^
- SELECT xmlparse(content '&idontexist;');
- ERROR: invalid XML content
- DETAIL: line 1: Entity 'idontexist' not defined
- &idontexist;
- ^
- line 1: chunk is not well balanced
--&idontexist;
-- ^
- SELECT xmlparse(content '');
- xmlparse
- ---------------------------
-@@ -240,11 +232,7 @@ DETAIL: line 1: Entity 'idontexist' not defined
- &idontexist;
- ^
- line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
--&idontexist;
-- ^
- line 1: chunk is not well balanced
--&idontexist;
-- ^
- SELECT xmlparse(content '');
- xmlparse
- ---------------------
-@@ -268,16 +256,12 @@ DETAIL: line 1: xmlParseEntityRef: no name
- &
- ^
- line 1: Opening and ending tag mismatch: invalidentity line 1 and abc
--&
-- ^
- SELECT xmlparse(document '&idontexist;');
- ERROR: invalid XML document
- DETAIL: line 1: Entity 'idontexist' not defined
- &idontexist;
- ^
- line 1: Opening and ending tag mismatch: undefinedentity line 1 and abc
--&idontexist;
-- ^
- SELECT xmlparse(document '');
- xmlparse
- ---------------------------
-@@ -296,8 +280,6 @@ DETAIL: line 1: Entity 'idontexist' not defined
- &idontexist;
- ^
- line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
--&idontexist;
-- ^
- SELECT xmlparse(document '');
- xmlparse
- ---------------------
diff --git a/postgresql-perl-5.22-test-fail.patch b/postgresql-perl-5.22-test-fail.patch
deleted file mode 100644
index 345c16d..0000000
--- a/postgresql-perl-5.22-test-fail.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream report:
-http://www.postgresql.org/message-id/flat/55739876.5010403@gmx.net
-
-diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
-index c447fa2..0932fde 100644
---- a/src/pl/plperl/expected/plperl_elog.out
-+++ b/src/pl/plperl/expected/plperl_elog.out
-@@ -36,8 +36,8 @@ create or replace function uses_global() returns text language plperl as $$
- return 'uses_global worked';
-
- $$;
--ERROR: Global symbol "$global" requires explicit package name at line 3.
--Global symbol "$other_global" requires explicit package name at line 4.
-+ERROR: Global symbol "$global" requires explicit package name (did you forget to declare "my $global"?) at line 3.
-+Global symbol "$other_global" requires explicit package name (did you forget to declare "my $other_global"?) at line 4.
- CONTEXT: compilation of PL/Perl function "uses_global"
- select uses_global();
- ERROR: function uses_global() does not exist
diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch
index 4fecc90..8e3b193 100644
--- a/postgresql-var-run-socket.patch
+++ b/postgresql-var-run-socket.patch
@@ -13,10 +13,10 @@ to be updated. (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.)
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index 2b6527f..8e178d4 100644
+index 9481f2d..75532c7 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
-@@ -2971,7 +2971,7 @@ static struct config_string ConfigureNamesString[] =
+@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
},
&Unix_socket_directories,
#ifdef HAVE_UNIX_SOCKETS
@@ -26,10 +26,10 @@ index 2b6527f..8e178d4 100644
"",
#endif
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index abf1586..8c01d48 100644
+index feeff9e..3e3d784 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
-@@ -1204,7 +1204,7 @@ setup_config(void)
+@@ -1234,7 +1234,7 @@ setup_config(void)
#ifdef HAVE_UNIX_SOCKETS
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -39,10 +39,10 @@ index abf1586..8c01d48 100644
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
#endif
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
-index 24c5069..aeec705 100644
+index e278fa0..9ee15d4 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
-@@ -144,7 +144,7 @@
+@@ -169,7 +169,7 @@
* here's where to twiddle it. You can also override this at runtime
* with the postmaster's -k switch.
*/
@@ -50,4 +50,4 @@ index 24c5069..aeec705 100644
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
/*
- * The random() function is expected to yield values between 0 and
+ * This is the default event source for Windows event log.
diff --git a/postgresql.spec b/postgresql.spec
index bf9116b..eb64338 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,9 +65,9 @@
Summary: PostgreSQL client programs
Name: postgresql
-%global majorversion 9.4
-Version: 9.4.5
-Release: 5%{?dist}
+%global majorversion 9.5
+Version: 9.5.0
+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.
@@ -82,10 +82,10 @@ 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 9.3.10
-%global prevmajorversion 9.3
+%global prevversion 9.4.5
+%global prevmajorversion 9.4
-%global setup_version 3.4
+%global setup_version 3.5
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
@@ -116,9 +116,7 @@ Patch3: postgresql-perl-rpath.patch
Patch4: postgresql-config-comment.patch
Patch5: postgresql-var-run-socket.patch
Patch6: postgresql-man.patch
-Patch7: postgresql-perl-5.22-test-fail.patch
-Patch8: postgresql-python3.5-tests.patch
-Patch9: postgresql-fix-xml2.patch
+Patch7: postgresql-python3.5-tests.patch
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -359,8 +357,6 @@ benchmarks.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@@ -783,10 +779,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
# remove files not to be packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-%if !%upgrade
-rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
-rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pg_upgrade.*
+
+%if !%plperl
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so
+%endif
+
+%if !%plpython
+rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so
%endif
# initialize file lists
@@ -820,6 +819,8 @@ cat pg_config-%{majorversion}.lang >>main.lst
cat pg_dump-%{majorversion}.lang >>main.lst
%find_lang pg_resetxlog-%{majorversion}
cat pg_resetxlog-%{majorversion}.lang >>server.lst
+%find_lang pg_rewind-%{majorversion}
+cat pg_rewind-%{majorversion}.lang >>server.lst
%find_lang pgscripts-%{majorversion}
cat pgscripts-%{majorversion}.lang >>main.lst
%if %plperl
@@ -917,6 +918,7 @@ fi
%{_bindir}/pg_dumpall
%{_bindir}/pg_isready
%{_bindir}/pg_restore
+%{_bindir}/pg_upgrade
%{_bindir}/psql
%{_bindir}/reindexdb
%{_bindir}/vacuumdb
@@ -932,6 +934,7 @@ fi
%{_mandir}/man1/pg_dumpall.*
%{_mandir}/man1/pg_isready.*
%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/pg_upgrade.*
%{_mandir}/man1/psql.*
%{_mandir}/man1/reindexdb.*
%{_mandir}/man1/vacuumdb.*
@@ -987,12 +990,11 @@ fi
%{_datadir}/pgsql/extension/seg*
%{_datadir}/pgsql/extension/tablefunc*
%{_datadir}/pgsql/extension/tcn*
-%{_datadir}/pgsql/extension/test_parser*
-%{_datadir}/pgsql/extension/test_shm_mq*
%{_datadir}/pgsql/extension/timetravel*
%{_datadir}/pgsql/extension/tsearch2*
+%{_datadir}/pgsql/extension/tsm_system_rows*
+%{_datadir}/pgsql/extension/tsm_system_time*
%{_datadir}/pgsql/extension/unaccent*
-%{_datadir}/pgsql/extension/worker_spi*
%{_libdir}/pgsql/_int.so
%{_libdir}/pgsql/adminpack.so
%{_libdir}/pgsql/auth_delay.so
@@ -1006,15 +1008,23 @@ fi
%{_libdir}/pgsql/dblink.so
%{_libdir}/pgsql/dict_int.so
%{_libdir}/pgsql/dict_xsyn.so
-%{_libdir}/pgsql/dummy_seclabel.so
%{_libdir}/pgsql/earthdistance.so
%{_libdir}/pgsql/file_fdw.so
%{_libdir}/pgsql/fuzzystrmatch.so
%{_libdir}/pgsql/hstore.so
+%if %plperl
+%{_libdir}/pgsql/hstore_plperl.so
+%endif
+%if %plpython
+%{_libdir}/pgsql/hstore_plpython2.so
+%endif
%{_libdir}/pgsql/insert_username.so
%{_libdir}/pgsql/isn.so
%{_libdir}/pgsql/lo.so
%{_libdir}/pgsql/ltree.so
+%if %plpython
+%{_libdir}/pgsql/ltree_plpython2.so
+%endif
%{_libdir}/pgsql/moddatetime.so
%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/passwordcheck.so
@@ -1031,12 +1041,11 @@ fi
%{_libdir}/pgsql/tablefunc.so
%{_libdir}/pgsql/tcn.so
%{_libdir}/pgsql/test_decoding.so
-%{_libdir}/pgsql/test_parser.so
-%{_libdir}/pgsql/test_shm_mq.so
%{_libdir}/pgsql/timetravel.so
%{_libdir}/pgsql/tsearch2.so
+%{_libdir}/pgsql/tsm_system_rows.so
+%{_libdir}/pgsql/tsm_system_time.so
%{_libdir}/pgsql/unaccent.so
-%{_libdir}/pgsql/worker_spi.so
%{_mandir}/man1/oid2name.*
%{_mandir}/man1/pg_archivecleanup.*
%{_mandir}/man1/pg_recvlogical.*
@@ -1079,6 +1088,7 @@ fi
%{_bindir}/pg_receivexlog
%{_bindir}/pg_recvlogical
%{_bindir}/pg_resetxlog
+%{_bindir}/pg_rewind
%{_bindir}/postgres
%{_bindir}/postgresql-setup
%{_bindir}/postmaster
@@ -1117,6 +1127,7 @@ fi
%{_mandir}/man1/pg_ctl.*
%{_mandir}/man1/pg_receivexlog.*
%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/pg_rewind.*
%{_mandir}/man1/postgres.*
%{_mandir}/man1/postgresql-setup.*
%{_mandir}/man1/postmaster.*
@@ -1149,10 +1160,7 @@ fi
%if %upgrade
%files upgrade
-%{_bindir}/pg_upgrade
-%{_libdir}/pgsql/pg_upgrade_support.so
%{_libdir}/pgsql/postgresql-%{prevmajorversion}
-%{_mandir}/man1/pg_upgrade.*
%endif
%if %plperl
@@ -1190,7 +1198,11 @@ fi
%endif
%changelog
-* Thu Dec 16 2015 Pavel Kajaba - 9.4.5-5
+* Wed Jan 06 2016 Pavel Raiskup - 9.5.0-1
+- update to 9.5.0 per release notes
+ http://www.postgresql.org/docs/9.5/static/release-9-5.html
+
+* Wed Dec 16 2015 Pavel Kajaba - 9.4.5-5
- fixed problem with xml2 test (rhbz#1286692)
* Thu Dec 3 2015 Pavel Kajaba - 9.4.5-4
diff --git a/sources b/sources
index bd51589..d7d3132 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,7 @@
-1b04cb359940bcc21ca4512c67e83290 postgresql-setup-3.4.tar.gz
-ec2365548d08f69c8023eddd4f2d1a28 postgresql-9.3.10.tar.bz2
-4097024cab41374aac237bb11293ca36 postgresql-9.3.10.tar.bz2.sha256
+dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz
8b2e3472a8dc786649b4d02d02e039a0 postgresql-9.4.5.tar.bz2
8d83dbba546035e37e84c8c9fa31e426 postgresql-9.4.5.tar.bz2.sha256
-59316c39552a081955cc50cfadad24e0 postgresql-9.4.5-US.pdf
+e58fffe9359e311ead94490a06b7147c postgresql-9.5.0.tar.bz2
+809ed037611f29a3d74507cbb9e1870c postgresql-9.5.0.tar.bz2.sha256
+d05afa73c47b95421fa5d84938e9d2fc postgresql-9.5.0-US.pdf
+dfcde13e377cf3cede345b04e8574eaf postgresql-setup-3.5.tar.gz